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

Prepare everything for distributing miri via rustup #57086

Merged
merged 5 commits into from
Jan 9, 2019

Conversation

oli-obk
Copy link
Contributor

@oli-obk oli-obk commented Dec 23, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 23, 2018
@kennytm kennytm added the T-release Relevant to the release subteam, which will review and decide on the PR/issue. label Dec 24, 2018
@kennytm
Copy link
Member

kennytm commented Dec 24, 2018

@bors try

@bors
Copy link
Contributor

bors commented Dec 24, 2018

⌛ Trying commit a808113 with merge c157742f7e2516794c540f2bba16c6a37ee8b417...

@bors
Copy link
Contributor

bors commented Dec 24, 2018

☀️ Test successful - status-travis
State: approved= try=True

@kennytm
Copy link
Member

kennytm commented Dec 28, 2018

@oli-obk The dist doesn't seem successful. Is it expected?

[01:50:36] Building stage2 tool miri (x86_64-unknown-linux-gnu)

[01:50:37] error: Package `miri v0.1.0 (/checkout/src/tools/miri)` does not have these features: `rustc-workspace-hack`

[01:50:37] 

[01:50:37] 

[01:50:37] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "build" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/miri/Cargo.toml" "--features" "rustc-workspace-hack/all-static" "--message-format" "json"

[01:50:37] expected success, got: exit code: 101

[01:50:37] Unable to build miri, skipping dist

[01:57:40] Build completed successfully in 1:53:28

@kennytm kennytm 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 Dec 28, 2018
@RalfJung
Copy link
Member

This might be caused by #56924 not having landed yet.

@kennytm kennytm 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 Dec 28, 2018
@kennytm
Copy link
Member

kennytm commented Dec 28, 2018

Marking this as "blocked" then.

@RalfJung
Copy link
Member

Miri has been updated, so this can proceed now.

@kennytm
Copy link
Member

kennytm commented Dec 29, 2018

@bors retry

@bors
Copy link
Contributor

bors commented Dec 29, 2018

⌛ Trying commit a808113 with merge b9b5646...

@kennytm kennytm 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 Dec 29, 2018
@bors
Copy link
Contributor

bors commented Dec 29, 2018

💔 Test failed - status-travis

@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 Dec 29, 2018
@rust-highfive
Copy link
Collaborator

The job dist-x86_64-linux 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.
travis_fold:end:services

travis_fold:start:git.checkout
travis_time:start:069992f5
$ git clone --depth=2 --branch=try https://github.com/rust-lang/rust.git rust-lang/rust
---
[02:08:11]    Compiling chrono v0.4.6
[02:08:14]    Compiling vergen v3.0.4
[02:08:17]    Compiling miri v0.1.0 (/checkout/src/tools/miri)
[02:09:02]     Finished release [optimized] target(s) in 54.31s
[02:09:02] duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
[02:09:02] 
[02:09:02] the following dependencies are duplicated although they have the same features enabled:
[02:09:02]   lock_api 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)
[02:09:02]     `miri` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblock_api-d1cfcbed72736cd0.rlib")
[02:09:02]     `cargo` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/liblock_api-7317565db4aa825a.rlib")
[02:09:02]   parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)
[02:09:02]     `miri` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libparking_lot-296134448e3a9962.rlib")
[02:09:02]     `cargo` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libparking_lot-cbd5205c8879a30d.rlib")
[02:09:02]   rustc-workspace-hack 1.0.0 (path+file:///checkout/src/tools/rustc-workspace-hack)
[02:09:02]     `miri` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_workspace_hack-574c161b5c78b8cb.rlib")
[02:09:02]     `cargo` ("/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/librustc_workspace_hack-831a5e7043354d91.rlib")
[02:09:02] the following dependencies have different features:
[02:09:02]   scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)
[02:09:02]     `miri` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libscopeguard-253cb60950318616.rlib"
[02:09:02]     `cargo` additionally enabled features {"use_std", "default"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libscopeguard-c042589f14e73ac1.rlib"
[02:09:02]   byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)
[02:09:02]     `miri` additionally enabled features {"i128"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-d19c3cbbf5a428d6.rlib"
[02:09:02]     `rls` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libbyteorder-f409f2b66e5f3bba.rlib"
[02:09:02]   curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)
[02:09:02]     `miri` additionally enabled features {} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libcurl_sys-2d3c8813bcfc2ee1.rlib"
[02:09:02]     `cargo` additionally enabled features {"http2", "libnghttp2-sys"} at "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/libcurl_sys-160bf63e87ae4364.rlib"
[02:09:02] 
[02:09:02] to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
[02:09:02] thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:170:13
[02:09:02] travis_fold:end:stage2-miri

[02:09:02] travis_time:end:stage2-miri:start=1546124120605405290,finish=1546124174966069338,duration=54360664048

---
travis_time:end:046bb5bc:start=1546124178964366386,finish=1546124178978174017,duration=13807631
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:16b34293
$ 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:04681b7a
travis_time:start:04681b7a
$ 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:005f2624
$ 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)

@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 1, 2019

@bors r=kennytm

@bors
Copy link
Contributor

bors commented Jan 1, 2019

📌 Commit d3894da has been approved by kennytm

@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 Jan 1, 2019
@kennytm
Copy link
Member

kennytm commented Jan 2, 2019

@bors r-

winapi feature mismatch
duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
the following dependencies are duplicated although they have the same features enabled:
  winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi_util-99433a355166b63c.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi_util-45568a2709ed2c5a.rlib")
  backtrace 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libbacktrace-3a1ef57ff65fc384.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libbacktrace-55c2819bab96ebb6.rlib")
  curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libcurl_sys-caecc71021b45f02.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libcurl_sys-be31cbf23def53b1.rlib")
  atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libatty-6f98353814470659.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libatty-6841a51755c86259.rlib")
  rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\librand-f5eabde797527f2f.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\librand-bafb7955617bdefe.rlib")
  wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwincolor-ae3f1502c9f40bba.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwincolor-25738d5f35fd22b0.rlib")
  error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\liberror_chain-ee74d0268356f343.rlib")
    `clippy-driver` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\liberror_chain-0e9c5430369aea41.rlib")
  parking_lot_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libparking_lot_core-eb027f15f6f5f04d.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libparking_lot_core-d8be4152740a36f2.rlib")
  termcolor 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libtermcolor-b2c3256f48cfd1bf.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libtermcolor-9c3466320343e801.rlib")
  parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libparking_lot-3993c4a08024a6df.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libparking_lot-347975fe1e7bbb4a.rlib")
  rustc-workspace-hack 1.0.0 (path+file:///C:/projects/rust/src/tools/rustc-workspace-hack)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\librustc_workspace_hack-3d92713b67de638b.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\librustc_workspace_hack-336224035bee3bac.rlib")
  env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libenv_logger-997f4995297e4e7e.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libenv_logger-71b31beb29050769.rlib")
  cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libcargo_metadata-b9264916ec663b77.rlib")
    `clippy-driver` ("C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libcargo_metadata-b9fff641a4e8ef5c.rlib")
the following dependencies have different features:
  winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)
    `miri` additionally enabled features {"knownfolders", "objbase", "shlobj"} at "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi-9b8933e1b03fce54.rlib"
    `cargo` additionally enabled features {} at "C:\\projects\\rust\\build\\x86_64-pc-windows-msvc\\stage2-tools\\x86_64-pc-windows-msvc\\release\\deps\\libwinapi-b21f9c741ca40796.rlib"
to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set

@kennytm kennytm 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 Jan 2, 2019
@mati865
Copy link
Contributor

mati865 commented Jan 7, 2019

@oli-obk you should add ["knownfolders", "objbase", "shlobj"] to https://github.com/rust-lang/rust/blob/master/src/tools/rustc-workspace-hack/Cargo.toml#L24-L50

@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 8, 2019

@bors r=kennytm

@bors
Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit 98a0224aa131ed504ef5163577a650c0f358b093 has been approved by kennytm

@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 Jan 8, 2019
@bors
Copy link
Contributor

bors commented Jan 8, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout miri_dist (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self miri_dist --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging src/bootstrap/tool.rs
Auto-merging src/bootstrap/dist.rs
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@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 Jan 8, 2019
@kennytm
Copy link
Member

kennytm commented Jan 8, 2019

Please rebase :(

@oli-obk
Copy link
Contributor Author

oli-obk commented Jan 8, 2019

@bors r=kennytm

@bors
Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit 2ab78e1 has been approved by kennytm

@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 Jan 8, 2019
@bors
Copy link
Contributor

bors commented Jan 9, 2019

⌛ Testing commit 2ab78e1 with merge 8c97b6f...

@bors
Copy link
Contributor

bors commented Jan 9, 2019

☀️ Test successful - status-appveyor, status-travis
Approved by: kennytm
Pushing 8c97b6f to master...

@bors bors merged commit 2ab78e1 into rust-lang:master Jan 9, 2019
@oli-obk oli-obk deleted the miri_dist branch June 15, 2020 15:30
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-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants