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] Update the clippy submodule #53199

Merged
merged 2 commits into from Aug 9, 2018

Conversation

Projects
None yet
6 participants
@oli-obk
Copy link
Contributor

oli-obk commented Aug 8, 2018

Clippy didn't build on the beta branch because of a rustc version sanity check

r? @kennytm

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Aug 8, 2018

⚠️ 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!
  • These commits modify submodules.
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Aug 8, 2018

The job x86_64-gnu-llvm-5.0 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.
######################################################################    98.1%
######################################################################## 100.0%
[00:02:49] extracting /checkout/obj/build/cache/2018-08-02/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
[00:02:49]     Updating registry `https://github.com/rust-lang/crates.io-index`
[00:03:26] error: the lock file needs to be updated but --locked was passed to prevent this
[00:03:26] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:03:26] make: *** [prepare] Error 1
[00:03:26] Makefile:81: recipe for target 'prepare' failed
[00:03:27] Command failed. Attempt 2/5:
[00:03:27] Command failed. Attempt 2/5:
[00:03:28] error: the lock file needs to be updated but --locked was passed to prevent this
[00:03:28] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:03:28] Makefile:81: recipe for target 'prepare' failed
[00:03:28] make: *** [prepare] Error 1
[00:03:30] Command failed. Attempt 3/5:
[00:03:30] Command failed. Attempt 3/5:
[00:03:31] error: the lock file needs to be updated but --locked was passed to prevent this
[00:03:31] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:03:31] make: *** [prepare] Error 1
[00:03:31] Makefile:81: recipe for target 'prepare' failed
[00:03:34] Command failed. Attempt 4/5:
[00:03:34] Command failed. Attempt 4/5:
[00:03:34] error: the lock file needs to be updated but --locked was passed to prevent this
[00:03:34] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:03:34] make: *** [prepare] Error 1
[00:03:34] Makefile:81: recipe for target 'prepare' failed

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

This comment has been minimized.

Copy link
Member

kennytm commented Aug 8, 2018

r=me after updating Cargo.lock.

@oli-obk oli-obk force-pushed the oli-obk:beta branch from 535868b to aba89c7 Aug 8, 2018

@kennytm kennytm changed the title Update the clippy submodule [beta] Update the clippy submodule Aug 8, 2018

@oli-obk

This comment has been minimized.

Copy link
Contributor Author

oli-obk commented Aug 8, 2018

@bors r=kennytm

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 8, 2018

📌 Commit aba89c7 has been approved by kennytm

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Aug 8, 2018

The job x86_64-gnu-tools 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.
[01:01:18]    Compiling clippy v0.0.212 (file:///checkout/src/tools/clippy)
[01:01:19] error: environment variable `PROFILE` not defined
[01:01:19]   --> tools/clippy/tests/compile-test.rs:16:42
[01:01:19]    |
[01:01:19] 16 |         PathBuf::from(concat!("target/", env!("PROFILE"), "/clippy-driver"))
[01:01:19] 
[01:01:19] error: environment variable `PROFILE` not defined
[01:01:19]   --> tools/clippy/tests/compile-test.rs:24:34
[01:01:19]    |
[01:01:19]    |
[01:01:19] 24 |         Path::new("target").join(env!("PROFILE"))
[01:01:19] 
[01:01:19] 
[01:01:19] error: environment variable `OUT_DIR` not defined
[01:01:19]   --> tools/clippy/tests/compile-test.rs:54:38
[01:01:19]    |
[01:01:19] 54 |         let mut path = PathBuf::from(env!("OUT_DIR"));
[01:01:19] 
[01:01:19] error: aborting due to 3 previous errors
[01:01:19] 
[01:01:19] error: Could not compile `clippy`.
---
[01:28:55] Verifying status of rustfmt...
[01:28:55] Verifying status of clippy-driver...
[01:28:55] This PR updated 'src/tools/clippy', verifying if status is 'test-pass'...
[01:28:55] 
[01:28:55] ⚠️ We detected that this PR updated 'clippy-driver', but its tests failed.
[01:28:55] 
[01:28:55] If you do intend to update 'clippy-driver', please check the error messages above and
[01:28:55] commit another update.
[01:28:55] 
[01:28:55] If you do NOT intend to update 'clippy-driver', please ensure you did not accidentally
[01:28:55] change the submodule at 'src/tools/clippy'. You may ask your reviewer for the
[01:28:55] proper steps.

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 3.
travis_time:start:003665b0
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_time:end:37a0b30c:start=1533752590308115785,finish=1533752590315522341,duration=7406556
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:0021b1f0
$ 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 -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:19f1f76c
travis_time:start:19f1f76c
$ 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:1cbdb400
$ 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

This comment has been minimized.

Copy link
Member

kennytm commented Aug 8, 2018

@bors r-

CI failed. env!("PROFILE")???

@cuviper

This comment has been minimized.

Copy link
Member

cuviper commented Aug 9, 2018

The build script used to "forward" PROFILE here.

@oli-obk oli-obk force-pushed the oli-obk:beta branch from aba89c7 to a7344fe Aug 9, 2018

@oli-obk

This comment has been minimized.

Copy link
Contributor Author

oli-obk commented Aug 9, 2018

also... OUT_DIR is magically set whenever a build script is present.

@bors r=kennytm (passes locally)

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit a7344fe has been approved by kennytm

@matthiaskrgr

This comment has been minimized.

Copy link
Contributor

matthiaskrgr commented Aug 9, 2018

Maybe the upstream clippy branch should have the name of the rustc version (1.29 in this case) instead of "beta"?

I could imagine, once clippy gets into 1.29 "stable", and then 1.30 becomes stable, the clippy stable branch would be overwritten with 1.30 clippy, but someone trying to compile the 1.29 stable rustc with clippy from the repo might run into problems because the "stable" clippy branch matches 1.30 now.

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Aug 9, 2018

We could add a 1.30.0 tag to that commit when it is released. These git operations can be done anytime.

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Aug 9, 2018

@bors p=3

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

⌛️ Testing commit a7344fe with merge e04cbf2...

bors added a commit that referenced this pull request Aug 9, 2018

Auto merge of #53199 - oli-obk:beta, r=kennytm
[beta] Update the clippy submodule

Clippy didn't build on the beta branch because of a rustc version sanity check

r? @kennytm
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

💔 Test failed - status-appveyor

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Aug 9, 2018

I think beta doesn't have the rustc workspace hack yet. Please add the winapi features ["consoleapi", "errhandlingapi", "processenv"] to the clippy beta branch.

@oli-obk

This comment has been minimized.

Copy link
Contributor Author

oli-obk commented Aug 9, 2018

The clippy on beta already has that hack dependency (and src/Cargo.toml has it, too): rust-lang/rust-clippy@c27cdca...1420750diff-80398c5faae3c069e4e6aa2ed11b28c0L60

I added the additional features to the hack crate

@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Aug 9, 2018

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

📌 Commit 22a4ef1 has been approved by kennytm

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

⌛️ Testing commit 22a4ef1 with merge d600a94...

bors added a commit that referenced this pull request Aug 9, 2018

Auto merge of #53199 - oli-obk:beta, r=kennytm
[beta] Update the clippy submodule

Clippy didn't build on the beta branch because of a rustc version sanity check

r? @kennytm
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Aug 9, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing d600a94 to beta...

@bors bors merged commit 22a4ef1 into rust-lang:beta Aug 9, 2018

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@kennytm

This comment has been minimized.

Copy link
Member

kennytm commented Aug 9, 2018

Clippy for beta has been successfully uploaded: https://s3-us-west-1.amazonaws.com/rust-lang-ci2/?prefix=rustc-builds/d600a945a6b189edd295f004d7406deb8bd4df22/cl

It should be available on the next beta in 20 hours (~03:30 UTC).

@oli-obk oli-obk deleted the oli-obk:beta branch Aug 10, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.