Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[beta] Utilize released stable over dev-static #64046

Merged
merged 1 commit into from
Sep 3, 2019

Conversation

Mark-Simulacrum
Copy link
Member

Fixes #63964

This isn't a complete fix for the above issue in that it doesn't deal with the caching problem but this does solve the problem for now and the caching problem is somewhat harder to solve.

r? @pietroalbini

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2019
@@ -25,7 +25,7 @@ cargo: 0.38.0
#
# This means that there's a small window of time (a few days) where artifacts
# are downloaded from dev-static.rust-lang.org instead of static.rust-lang.org.
# In order to ease this transition we have an extra key which is in the
# In order to ease this transition we have an extra key which is in the
Copy link
Member Author

Choose a reason for hiding this comment

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

I feel like this happens every time I edit this file... probably because we keep re-getting this from master or something.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe send a PR to master with that change?

@pietroalbini
Copy link
Member

@bors r+ p=-1

@bors
Copy link
Collaborator

bors commented Sep 2, 2019

📌 Commit 15a07a8 has been approved by pietroalbini

@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 Sep 2, 2019
pietroalbini added a commit to pietroalbini/rust that referenced this pull request Sep 2, 2019
bors added a commit that referenced this pull request Sep 3, 2019
[beta] Rollup backports

Rolled up:

* [beta] Utilize released stable over dev-static #64046

Cherry picked:

* Update rust-installer to limit memory use #63984
* debuginfo: give unique names to closure and generator types #63875
* ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772
* Fix nested eager expansions in arguments of `format_args` #63717

r? @ghost
@bors bors merged commit 15a07a8 into rust-lang:beta Sep 3, 2019
@bors
Copy link
Collaborator

bors commented Sep 3, 2019

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

@bors bors 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 Sep 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants