Skip to content

rustbuild: Update bootstrap compiler#40524

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-bootstrap
Mar 30, 2017
Merged

rustbuild: Update bootstrap compiler#40524
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-bootstrap

Conversation

@alexcrichton

Copy link
Copy Markdown
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
Copy Markdown
Contributor

r? @arielb1

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

@brson

brson commented Mar 15, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 15, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit e58f9f5 has been approved by brson

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 17, 2017
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

bors commented Mar 19, 2017

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Mar 19, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 0d5184c has been approved by brson

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

@bors

bors commented Mar 21, 2017

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Mar 22, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit f9eea7b has been approved by brson

@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit f9eea7b with merge b6d437f...

@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

📌 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
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Mar 23, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c2b44a3 has been approved by brson

@alexcrichton alexcrichton mentioned this pull request Mar 23, 2017
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 24, 2017
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

Copy link
Copy Markdown
Contributor

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.com-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
Copy Markdown
Member Author

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

@bors: r-

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
Copy Markdown
Member Author

@bors: r+

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c033942 has been approved by alexcrichton

@alexcrichton alexcrichton reopened this Mar 29, 2017
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r+

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit c033942 has been approved by alexcrichton

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c033942 with merge 0ec68ff...

@bors

bors commented Mar 29, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@alexcrichton

Copy link
Copy Markdown
Member Author

@bors

bors commented Mar 30, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c033942 with merge 8b7efd6...

@frewsxcv

Copy link
Copy Markdown
Contributor

@bors retry

@bors

bors commented Mar 30, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c033942 with merge 5c94997...

bors added a commit that referenced this pull request Mar 30, 2017
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

bors commented Mar 30, 2017

Copy link
Copy Markdown
Collaborator

☀️ 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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants