Skip to content

Fix broken download link in the armhf-gnu image - #59499

Merged
bors merged 1 commit into
rust-lang:masterfrom
emilyalbini:fix-arm-broken-link
Mar 30, 2019
Merged

Fix broken download link in the armhf-gnu image#59499
bors merged 1 commit into
rust-lang:masterfrom
emilyalbini:fix-arm-broken-link

Conversation

@emilyalbini

Copy link
Copy Markdown
Member

Thanks to @johnterickson for pointing this out!

r? @alexcrichton

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 28, 2019
@alexcrichton

Copy link
Copy Markdown
Member

@bors: r+ rollup

@bors

bors commented Mar 29, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 8fd3be5 has been approved by alexcrichton

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2019
@emilyalbini

Copy link
Copy Markdown
MemberAuthor

@bors rollup-

This will rebuild Docker images, let's not do that in a rollup.

Centril added a commit to Centril/rust that referenced this pull request Mar 29, 2019
…=alexcrichton
Fix broken download link in the armhf-gnu image
Thanks to @johnterickson for pointing this out!
r? @alexcrichton
@CentrilCentril mentioned this pull request Mar 29, 2019
Centril added a commit to Centril/rust that referenced this pull request Mar 30, 2019
…=alexcrichton
Fix broken download link in the armhf-gnu image
Thanks to @johnterickson for pointing this out!
r? @alexcrichton
@CentrilCentril mentioned this pull request Mar 30, 2019
bors added a commit that referenced this pull request Mar 30, 2019
Rollup of 10 pull requests
Successful merges:
- #59376 (RFC 2008: Enum Variants)
- #59453 (Recover from parse error in tuple syntax)
- #59455 (Account for short-hand field syntax when suggesting borrow)
- #59499 (Fix broken download link in the armhf-gnu image)
- #59512 (implement `AsRawFd` for stdio locks)
- #59525 (Whitelist some rustc attrs)
- #59528 (Improve the dbg! macro docs )
- #59532 (In doc examples, don't ignore read/write results)
- #59534 (rustdoc: collapse blanket impls in the same way as normal impls)
- #59537 (Fix OnceWith docstring.)
Failed merges:
r? @ghost
@bors

bors commented Mar 30, 2019

Copy link
Copy Markdown
Collaborator

☔ The latest upstream changes (presumably #59550) made this pull request unmergeable. Please resolve the merge conflicts.

@borsbors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 30, 2019
@bors
bors merged commit 8fd3be5 into rust-lang:masterMar 30, 2019
@emilyalbini
emilyalbini deleted the fix-arm-broken-link branch March 30, 2019 14:28
@emilyalbiniemilyalbini added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 8, 2019
@emilyalbiniemilyalbini mentioned this pull request Apr 8, 2019
@@ -71,7 +71,8 @@ COPY scripts/qemu-bare-bones-addentropy.c /tmp/addentropy.c
RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static

# TODO: What is this?!

@tesujitesujiApr 8, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to explain what it is? In that case, it is Device Tree Blob of ARM Versatile Express Emulation for Cortex-A9.
See https://wiki.qemu.org/Documentation/Platforms/ARM or https://learningfromyoublog.wordpress.com/2016/04/05/131/ .

bors added a commit that referenced this pull request Apr 8, 2019
[beta] Rollup backports
Cherry-picked:
* #58021: Fix fallout from #57667
* #59599: Updated RELEASES.md for 1.34.0
* #59587: Remove #[doc(hidden)] from Error::type_id
* #58994: Hide deprecation warnings inside derive expansions
* #58015: Expand docs for `TryFrom` and `TryInto`.
* #59770: ci: pin android emulator to 28.0.23
* #59704: ci: Update FreeBSD tarball downloads
* #59257: Update CI configuration for building Redox libraries
* #59724: Function arguments should never get promoted
* #59499: Fix broken download link in the armhf-gnu image
* #58330: Add rustdoc JS non-std tests
* #58848: Prevent cache issues on version updates
r? @ghost
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.S-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.T-infraRelevant to the infrastructure team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@emilyalbini@alexcrichton@bors@tesuji@rust-highfive