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

Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02) #17780

Merged
merged 2 commits into from
Jul 19, 2017
Merged

Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02) #17780

merged 2 commits into from
Jul 19, 2017

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Jul 18, 2017 •
edited by larsbergstrom
Loading

Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: rust-lang/cargo#4123 (comment)

This change is Reviewable

@nox
Copy link
Contributor

nox commented Jul 18, 2017

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 298d388 has been approved by nox

@highfive highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 18, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 298d388 with merge 8d47a10...

bors-servo pushed a commit that referenced this pull request Jul 18, 2017
Auto merge of #17780 - servo:cargoup, r=nox
8d47a10 
Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02)

Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: rust-lang/cargo#4123 (comment)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17780)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - windows-msvc-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 18, 2017
@SimonSapin
Copy link
Member Author 

error: failed to run custom build command for `libz-sys v1.0.13`
process didn't exit successfully: `c:\buildbot\slave\windows-msvc-dev\build\target\debug\build\libz-sys-4abfd0d9bb7613d5\build-script-build` (exit code: 1)
--- stdout
running: "C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\BIN\\amd64\\nmake.exe" "/nologo" "/f" "c:\\buildbot\\slave\\windows-msvc-dev\\build\\target\\debug\\build\\libz-sys-d0b3a110f6f2f1d0\\out\\build/win32/Makefile.msc" "zlib.lib"


command did not execute successfully, got: exit code: 2



--- stderr

Microsoft (R) Program Maintenance Utility Version 14.00.24210.0
Copyright (C) Microsoft Corporation.  All rights reserved.

NMAKE : fatal error U1065: invalid option '-'
Stop.

I’m a bit surprised that updating Cargo would cause this… let’s see if it’s intermittent:

@bors-servo retry

@bors-servo
Copy link
Contributor

⌛ Testing commit 298d388 with merge 068ae56...

bors-servo pushed a commit that referenced this pull request Jul 18, 2017
Auto merge of #17780 - servo:cargoup, r=nox
068ae56 
Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02)

Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: rust-lang/cargo#4123 (comment)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17780)
<!-- Reviewable:end -->
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 18, 2017
@bors-servo
Copy link
Contributor

💔 Test failed - windows-msvc-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jul 18, 2017
@SimonSapin
Copy link
Member Author

Same.

@SimonSapin
Copy link
Member Author

@alexcrichton, any idea why we’d get NMAKE : fatal error U1065: invalid option '-' when compiling libz-sys on Windows after updating Cargo?

I’ll try bisecting Cargo tomorrow. The initial range is 2233f51 2017-05-17 to eb6cf012a 2017-07-02.

@SimonSapin
Copy link
Member Author

I’ll try bisecting Cargo tomorrow. The initial range is 2233f51 2017-05-17 to eb6cf012a 2017-07-02.

… except I don’t have access to a Windows dev environment, and bisecting through AppVeyor sounds like a pain.

@alexcrichton
Copy link
Contributor

I believe that corresponds to rust-lang/cargo#4156 which should be fixed on master branches of things, but I think Cargo may not have been updated? You can also update libz-sys as well to fix that (and likely a few other *-sys dependencies)

@SimonSapin
Update libz-sys
b0e3005 
#17780 (comment)
@SimonSapin
Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02)
8303f5b 
Cargo binaries are now produced on Rust’s CI, not Cargo’s.
Remove cargo-commit-hash and find Cargo based on rust-commit-hash.
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 18, 2017
@SimonSapin
Copy link
Member Author

You can also update libz-sys

Let’s try this.

@bors-servo r=nox,SimonSapin

@bors-servo
Copy link
Contributor

📌 Commit 8303f5b has been approved by nox,SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Jul 18, 2017
@bors-servo
Copy link
Contributor

⌛ Testing commit 8303f5b with merge d403f40...

bors-servo pushed a commit that referenced this pull request Jul 18, 2017
Auto merge of #17780 - servo:cargoup, r=nox,SimonSapin
d403f40 
Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02)

Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: rust-lang/cargo#4123 (comment)

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17780)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: nox,SimonSapin
Pushing d403f40 to master...

@bors-servo bors-servo merged commit 8303f5b into master Jul 19, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 19, 2017
@SimonSapin
Copy link
Member Author

Thanks for your help Alex!

@SimonSapin SimonSapin deleted the cargoup branch July 19, 2017 07:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nox nox

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@SimonSapin @nox @bors-servo @alexcrichton @highfive