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

Bump cargo-vendor version #55363

Merged
merged 1 commit into from
Nov 3, 2018
Merged

Conversation

pietroalbini
Copy link
Member

Currently we pin cargo-vendor to 0.1.4, which doesn't set the User-Agent HTTP header. crates.io is going to require that header in the near future, so this PR bumps the pinned version of the crate to the latest one (which correctly sets the header).

r? @Mark-Simulacrum
cc @sgrif

@pietroalbini pietroalbini added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Oct 25, 2018
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 25, 2018
@Mark-Simulacrum
Copy link
Member

It's be great to run a crater-equivalent and file issues against repositories with Cargo.lock files pinging cargo-vendor like this.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 25, 2018

📌 Commit 8b339b6 has been approved by Mark-Simulacrum

@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 25, 2018
@Mark-Simulacrum
Copy link
Member

Oh, also, we should not make this change on crates.io until stable Rust artifacts contain this change to ensure stable builds

@pietroalbini
Copy link
Member Author

@bors r-

Looking at the code a bit more, it might not be the cargo version.

@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 Oct 25, 2018
@sgrif
Copy link
Contributor

sgrif commented Oct 25, 2018

@Mark-Simulacrum I'm not 100% sure I understand what you mean by

until stable Rust artifacts contain this change to ensure stable builds

@pietroalbini
Copy link
Member Author

@bors r=Mark-Simulacrum p=1

Confirmed this fixes the issue: cargo-vendor 0.1.4 pins cargo 0.16.0, which doesn't set an user agent.

@bors
Copy link
Contributor

bors commented Oct 25, 2018

📌 Commit 8b339b6 has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 25, 2018
@Mark-Simulacrum
Copy link
Member

@sgrif right now the just-shipped 1.30 rust artifacts don't contain this PR which I think might make it such that distros would be unable to build in some cases if we made the change to crates.io; basically, ideally we'd wait until 1.31 ships to make that change. Does that help?

@sgrif
Copy link
Contributor

sgrif commented Oct 25, 2018

@Mark-Simulacrum So the concern is for distros that build from source?

@bors
Copy link
Contributor

bors commented Oct 26, 2018

⌛ Testing commit 8b339b6 with merge f475375...

bors added a commit that referenced this pull request Oct 26, 2018
…acrum

Bump cargo-vendor version to 0.1.17

Currently we pin `cargo-vendor` to 0.1.4, which doesn't set the `User-Agent` HTTP header. crates.io is going to require that header in the near future, so this PR bumps the pinned version of the crate to the latest one (which correctly sets the header).

r? @Mark-Simulacrum
cc @sgrif
@bors
Copy link
Contributor

bors commented Oct 26, 2018

💔 Test failed - status-travis

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:05:24] 
[00:05:24] Caused by:
[00:05:24]   feature `edition` is required
[00:05:24] 
[00:05:24] this Cargo does not support nightly features, but if you
[00:05:24] switch to nightly channel you can add
[00:05:24] `cargo-features = ["edition"]` to enable this feature
[00:05:24] 
[00:05:24] 
[00:05:24] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "vendor"
[00:05:24] 
[00:05:24] 
[00:05:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:05:24] Build completed unsuccessfully in 0:02:16
---
travis_time:end:0a7faa1d:start=1540533255226169726,finish=1540533255233755734,duration=7586008
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0a85b042
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0ef7194a
travis_time:start:0ef7194a
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:017a7a79
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2018
@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 26, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-distcheck of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[00:05:29] 
[00:05:29] Caused by:
[00:05:29]   feature `edition` is required
[00:05:29] 
[00:05:29] this Cargo does not support nightly features, but if you
[00:05:29] switch to nightly channel you can add
[00:05:29] `cargo-features = ["edition"]` to enable this feature
[00:05:29] 
[00:05:29] 
[00:05:29] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "vendor"
[00:05:29] 
[00:05:29] 
[00:05:29] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test distcheck
[00:05:29] Build completed unsuccessfully in 0:02:12
---
travis_time:end:0450beb4:start=1540551403730760736,finish=1540551403740761834,duration=10001098
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0640ffba
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:134ab4b4
travis_time:start:134ab4b4
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0349512c
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@kennytm
Copy link
Member

kennytm commented Oct 26, 2018

@bors r-

Looks like it doesn't work 😕

@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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2018
@Mark-Simulacrum
Copy link
Member

RUSTC_BOOTSTRAP isn't enough because Cargo uses a different environment variable, IIRC.

@pietroalbini
Copy link
Member Author

Ok, I don't think I can solve this.

cargo-vendor depends on the Cargo version published on crates.io, which is 0.30.0 at the moment and should be 0.31.0 soon. In all those versions the edition key is marked as unstable, and gated with cargo-features = ["edition"].

The problem we're having right now is that Clippy removed the feature gate from its Cargo.toml, but Cargo 0.30.0 expects it even on nightly. So setting up RUSTC_BOOTSTRAP or the Cargo-only equivalent doesn't fix the error.

What should we do?

cc @Manishearth @oli-obk

RUSTC_BOOTSTRAP isn't enough because Cargo uses a different environment variable, IIRC.

Cargo also reads RUSTC_BOOTSTRAP in addition to the override, so that's not the problem.

@Manishearth
Copy link
Member

Feel free to add the gate to clippy again

@pietroalbini
Copy link
Member Author

This is blocked on alexcrichton/cargo-vendor#138.
After that PR is merged there will be no need to remove nightly features from Cargo.tomls.

@pietroalbini pietroalbini added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 31, 2018
@pietroalbini pietroalbini changed the title Bump cargo-vendor version to 0.1.17 Bump cargo-vendor version Oct 31, 2018
@pietroalbini pietroalbini added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Oct 31, 2018
@pietroalbini
Copy link
Member Author

Bumped cargo-vendor to 0.1.19: it's now using Cargo 0.31.0 (with stable edition), and it enables nightly features by default. This should work now.

@pietroalbini
Copy link
Member Author

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 1, 2018

📌 Commit 4084eb0 has been approved by Mark-Simulacrum

@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 Nov 1, 2018
@pietroalbini
Copy link
Member Author

@bors p=0

Not critical to get this merged as soon as possible, since the crates.io team is not implementing this change right now (and it might not affect us anyway if they continue to allow downloads without an user agent).

@bors
Copy link
Contributor

bors commented Nov 3, 2018

⌛ Testing commit 4084eb0 with merge 757d6cc...

bors added a commit that referenced this pull request Nov 3, 2018
…acrum

Bump cargo-vendor version

Currently we pin `cargo-vendor` to 0.1.4, which doesn't set the `User-Agent` HTTP header. crates.io is going to require that header in the near future, so this PR bumps the pinned version of the crate to the latest one (which correctly sets the header).

r? @Mark-Simulacrum
cc @sgrif
@bors
Copy link
Contributor

bors commented Nov 3, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 757d6cc to master...

@bors bors merged commit 4084eb0 into rust-lang:master Nov 3, 2018
@pietroalbini pietroalbini deleted the update-cargo-vendor branch November 3, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants