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.

Sign up for GitHub

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

Jump to bottom

rustbuild: Update bootstrap compiler #40524

Merged
merged 1 commit into from
Mar 30, 2017
Merged

rustbuild: Update bootstrap compiler #40524

merged 1 commit into from
Mar 30, 2017

Conversation

alexcrichton
Copy link
Member

Now that we've also updated cargo's release process this commit also changes the
download location of Cargo from Cargos archives back to the static.r-l.o
archives. This should ensure that the Cargo download is the exact Cargo paired
with the rustc that we release.

@rust-highfive
Copy link
Collaborator

r? @arielb1

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented Mar 15, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Mar 15, 2017

📌 Commit e58f9f5 has been approved by brson

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 17, 2017
@frewsxcv
Rollup merge of rust-lang#40524 - alexcrichton:update-bootstrap, r=brson
50bf60e 
rustbuild: Update bootstrap compiler

Now that we've also updated cargo's release process this commit also changes the
download location of Cargo from Cargos archives back to the static.r-l.o
archives. This should ensure that the Cargo download is the exact Cargo paired
with the rustc that we release.
@frewsxcv frewsxcv mentioned this pull request Mar 17, 2017
Closed
@bors
Copy link
Contributor

bors commented Mar 19, 2017

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

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 19, 2017

📌 Commit 0d5184c has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 21, 2017

🔒 Merge conflict

@bors
Copy link
Contributor

bors commented Mar 21, 2017

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

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 22, 2017

📌 Commit f9eea7b has been approved by brson

@bors
Copy link
Contributor

bors commented Mar 23, 2017

⌛ Testing commit f9eea7b with merge b6d437f...

@bors
Copy link
Contributor

bors commented Mar 23, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 23, 2017

📌 Commit 7496acb has been approved by brson

@alexcrichton alexcrichton force-pushed the update-bootstrap branch 2 times, most recently from 7a9b4c2 to c2b44a3 Compare March 23, 2017 15:32
@alexcrichton
Copy link
Member Author

@bors: r=brson

@bors
Copy link
Contributor

bors commented Mar 23, 2017

📌 Commit c2b44a3 has been approved by brson

@alexcrichton alexcrichton mentioned this pull request Mar 23, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 24, 2017
@frewsxcv
Rollup merge of rust-lang#40524 - alexcrichton:update-bootstrap, r=brson
e0322e5 
rustbuild: Update bootstrap compiler

Now that we've also updated cargo's release process this commit also changes the
download location of Cargo from Cargos archives back to the static.r-l.o
archives. This should ensure that the Cargo download is the exact Cargo paired
with the rustc that we release.
@frewsxcv frewsxcv mentioned this pull request Mar 24, 2017
Closed
@frewsxcv frewsxcv mentioned this pull request Mar 29, 2017
Closed
@frewsxcv
Copy link
Member

Both #40810 and #40884 had this pull request in common and failed with the same error:

[00:53:56] error: unable to get packages from source
[00:53:56] 
[00:53:56] Caused by:
[00:53:56]   failed to parse manifest at `/cargo/registry/src/github.aaakk.us.kg-1ecc6299db9ec823/url-0.5.7/Cargo.toml`
[00:53:56] 
[00:53:56] Caused by:
[00:53:56]   could not parse input as TOML
[00:53:56] 
[00:53:56] Caused by:
[00:53:56]   expected newline, found an identifier at line 14
[00:53:56] thread 'main' panicked at 'tests failed for https://github.com/iron/iron', /checkout/src/tools/cargotest/main.rs:98
[00:53:56] note: Run with `RUST_BACKTRACE=1` for a backtrace.

Is this error somehow related to this PR?

@alexcrichton
Copy link
Member Author

Gah sorry forgot to r- this, yes that is the fault of this PR

@bors: r-

@est31 est31 mentioned this pull request Mar 29, 2017
Closed
@alexcrichton
rustbuild: Update bootstrap compiler
c033942 
Now that we've also updated cargo's release process this commit also changes the
download location of Cargo from Cargos archives back to the static.r-l.o
archives. This should ensure that the Cargo download is the exact Cargo paired
with the rustc that we release.
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 29, 2017

📌 Commit c033942 has been approved by alexcrichton

@alexcrichton alexcrichton reopened this Mar 29, 2017
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Mar 29, 2017

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Contributor

bors commented Mar 29, 2017

📌 Commit c033942 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Mar 29, 2017

⌛ Testing commit c033942 with merge 0ec68ff...

@bors
Copy link
Contributor

bors commented Mar 29, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

@bors: retry

@frewsxcv frewsxcv mentioned this pull request Mar 30, 2017
Closed
@bors
Copy link
Contributor

bors commented Mar 30, 2017

⌛ Testing commit c033942 with merge 8b7efd6...

@frewsxcv
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Mar 30, 2017

⌛ Testing commit c033942 with merge 5c94997...

bors added a commit that referenced this pull request Mar 30, 2017
@bors
Auto merge of #40524 - alexcrichton:update-bootstrap, r=alexcrichton
5c94997 
rustbuild: Update bootstrap compiler

Now that we've also updated cargo's release process this commit also changes the
download location of Cargo from Cargos archives back to the static.r-l.o
archives. This should ensure that the Cargo download is the exact Cargo paired
with the rustc that we release.
@bors
Copy link
Contributor

bors commented Mar 30, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 5c94997 to master...

@bors bors merged commit c033942 into rust-lang:master Mar 30, 2017
@alexcrichton alexcrichton deleted the update-bootstrap branch April 4, 2017 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@arielb1 arielb1

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @brson @bors @arielb1 @frewsxcv