Skip to content

Use different mirror for linux headers in musl-toolchain CI script. #78316

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 3 commits into from
Oct 24, 2020

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Oct 24, 2020

Should hopefully fix the CI failure of #78309

musl-cross-make Makefile for reference: https://github.com/richfelker/musl-cross-make/blob/a54eb56f33f255dfca60be045f12a5cfaf5a72a9/Makefile

r? @pietroalbini

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 24, 2020
@pietroalbini
Copy link
Member

@bors r+ p=1000

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

📌 Commit 2949d5d0e78b91e3642521aaef836600fe35bfff has been approved by pietroalbini

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

@bors bors 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 Oct 24, 2020
@bors
Copy link
Collaborator

bors commented Oct 24, 2020

⌛ Testing commit 2949d5d0e78b91e3642521aaef836600fe35bfff with merge 160c24a2876723b73b1b56594ebffeef889df6c7...

@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 24, 2020

Missed a ignore-tidy-linelength

@bors r=pietroalbini

@bors retry

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

📌 Commit 409a5ea517466d7e54ce622310bc5d06174e3948 has been approved by pietroalbini

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

⌛ Testing commit 409a5ea517466d7e54ce622310bc5d06174e3948 with merge 233fd53021f20d2ecedc4698d77a8f414a609e56...

@m-ou-se
Copy link
Member Author

m-ou-se commented Oct 24, 2020

Apparently, the script wants the url without the trailing slash. :)

@bors r=pietroalbini retry

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

📌 Commit 76e51b8 has been approved by pietroalbini

@bors
Copy link
Collaborator

bors commented Oct 24, 2020

⌛ Testing commit 76e51b8 with merge 2e8a54a...

@m-ou-se m-ou-se changed the title Use different mirror for sabotage linux in musl-toolchain CI script. Use different mirror for linux headers in musl-toolchain CI script. Oct 24, 2020
@bors
Copy link
Collaborator

bors commented Oct 24, 2020

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing 2e8a54a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 24, 2020
@bors bors merged commit 2e8a54a into rust-lang:master Oct 24, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 24, 2020
@Mark-Simulacrum Mark-Simulacrum 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. labels Nov 6, 2020
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.49.0, 1.48.0 Nov 6, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 7, 2020
…ulacrum

[beta] backports

This backports a number of PRs to beta:

* Add delay_span_bug to no longer ICE rust-lang#78645
* Do not ICE on invalid input rust-lang#78422
* revert rust-lang#75443, update mir validator rust-lang#78410
* Do not try to report on closures to avoid ICE rust-lang#78268
* Disable "optimization to avoid load of address" in InstCombine rust-lang#78195
* Disable MatchBranchSimplification rust-lang#78151
* Do not ICE with TraitPredicates containing [type error] rust-lang#77930
* Tweak `if let` suggestion to be more liberal with suggestion and to not ICE rust-lang#77283
* Use different mirror for linux headers in musl-toolchain CI script. rust-lang#78316
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 15, 2020
@m-ou-se m-ou-se deleted the fix-musl-ci-build branch January 20, 2021 18:55
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants