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

Beta: bootstrap from 1.24.0 stable. #48183

Merged
merged 2 commits into from
Feb 18, 2018
Merged

Beta: bootstrap from 1.24.0 stable. #48183

merged 2 commits into from
Feb 18, 2018

Conversation

Mark-Simulacrum
Copy link
Member

r? @alexcrichton

I think this is all correct... not sure about Cargo, but seems fine for now, we can always change later.

@Mark-Simulacrum
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Feb 13, 2018

📌 Commit 1b28d02 has been approved by Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Feb 13, 2018
@alexcrichton
Copy link
Member

Looks like the lockfile may need an update?

@Mark-Simulacrum
Copy link
Member Author

@bors r-

Ah. Okay. I'll do that.

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

@bors r+

@bors
Copy link
Contributor

bors commented Feb 13, 2018

📌 Commit d625fd9 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 Feb 13, 2018
@kennytm
Copy link
Member

kennytm commented Feb 13, 2018

@bors r-

Lots of run-pass-fulldeps tests failed due to conflicting rand crates.

[01:13:21] ---- [run-pass] run-pass-fulldeps/env.rs stdout ----
[01:13:21] 	
[01:13:21] error: compilation failed!
[01:13:21] status: exit code: 101
[01:13:21] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/run-pass-fulldeps/env.rs" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps" "--target=x86_64-unknown-linux-gnu" "-C" "prefer-dynamic" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/env.stage2-x86_64-unknown-linux-gnu" "-Crpath" "-O" "-Zmiri" "-Zunstable-options" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--test" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-pass-fulldeps/env.stage2-x86_64-unknown-linux-gnu.aux"
[01:13:21] stdout:
[01:13:21] ------------------------------------------
[01:13:21] 
[01:13:21] ------------------------------------------
[01:13:21] stderr:
[01:13:21] ------------------------------------------
[01:13:21] error[E0464]: multiple matching crates for `rand`
[01:13:21]   --> /checkout/src/test/run-pass-fulldeps/env.rs:15:1
[01:13:21]    |
[01:13:21] 15 | extern crate rand;
[01:13:21]    | ^^^^^^^^^^^^^^^^^^
[01:13:21]    |
[01:13:21]    = note: candidates:
[01:13:21]            crate `rand`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand-f666896b2039530f.rlib
[01:13:21]            crate `rand`: /checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand-0df21e9bf78b9472.rlib
[01:13:21] 
[01:13:21] error[E0463]: can't find crate for `rand`
[01:13:21]   --> /checkout/src/test/run-pass-fulldeps/env.rs:15:1
[01:13:21]    |
[01:13:21] 15 | extern crate rand;
[01:13:21]    | ^^^^^^^^^^^^^^^^^^ can't find crate
[01:13:21] 
[01:13:21] error: aborting due to 2 previous errors

...

[01:13:21] failures:
[01:13:21]     [run-pass] run-pass-fulldeps/binary-heap-panic-safe.rs
[01:13:21]     [run-pass] run-pass-fulldeps/env.rs
[01:13:21]     [run-pass] run-pass-fulldeps/flt2dec.rs
[01:13:21]     [run-pass] run-pass-fulldeps/sort-unstable.rs
[01:13:21]     [run-pass] run-pass-fulldeps/vector-sort-panic-safe.rs

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

Updated to a lockfile with only one rand. There's two miows but I'm going to presume that's fine.

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Feb 13, 2018

📌 Commit 99fddf3 has been approved by alexcrichton

@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 Feb 13, 2018
@bors
Copy link
Contributor

bors commented Feb 13, 2018

⌛ Testing commit 99fddf3 with merge 924c644...

bors added a commit that referenced this pull request Feb 13, 2018
@bors
Auto merge of #48183 - Mark-Simulacrum:beta-next, r=alexcrichton
924c644 
Beta: bootstrap from 1.24.0 stable.

r? @alexcrichton

I think this is all correct... not sure about Cargo, but seems fine for now, we can always change later.
@bors
Copy link
Contributor

bors commented Feb 13, 2018

💔 Test failed - status-travis

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

@nrc RLS appears to have failed, do you know if we have a known-good version that we can switch to?

01:44:09] failures:
[01:44:09] 
[01:44:09] ---- test::test_find_impls stdout ----
[01:44:09] 	expect_messages:
[01:44:09]   results: [
[01:44:09]     "{\"jsonrpc\":\"2.0\",\"id\":0,\"result\":{\"capabilities\":{\"textDocumentSync\":2,\"hoverProvider\":true,\"completionProvider\":{\"resolveProvider\":true,\"triggerCharacters\":[\".\",\":\"]},\"definitionProvider\":true,\"referencesProvider\":true,\"documentHighlightProvider\":true,\"documentSymbolProvider\":true,\"workspaceSymbolProvider\":true,\"codeActionProvider\":true,\"documentFormattingProvider\":true,\"documentRangeFormattingProvider\":false,\"renameProvider\":true,\"executeCommandProvider\":{\"commands\":[\"rls.applySuggestion\",\"rls.deglobImports\"]}}}}",
[01:44:09]     "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/beginBuild\"}",
[01:44:09]     "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/diagnosticsBegin\"}",
[01:44:09]     "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/diagnosticsEnd\"}"
[01:44:09] ],
[01:44:09]   expected: [
[01:44:09]     ExpectedMessage {
[01:44:09]         id: Some(
[01:44:09]             0
[01:44:09]         ),
[01:44:09]         contains: [
[01:44:09]             "capabilities"
[01:44:09]         ]
[01:44:09]     },
[01:44:09]     ExpectedMessage {
[01:44:09]         id: None,
[01:44:09]         contains: [
[01:44:09]             "beginBuild"
[01:44:09]         ]
[01:44:09]     },
[01:44:09]     ExpectedMessage {
[01:44:09]         id: None,
[01:44:09]         contains: [
[01:44:09]             "diagnosticsBegin"
[01:44:09]         ]
[01:44:09]     },
[01:44:09]     ExpectedMessage {
[01:44:09]         id: None,
[01:44:09]         contains: [
[01:44:09]             "diagnosticsEnd"
[01:44:09]         ]
[01:44:09]     }
[01:44:09] ]
[01:44:09] expect_messages:
[01:44:09]   results: [
[01:44:09]     "{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":[{\"uri\":\"file:///checkout/src/tools/rls/test_data/find_impls/src/main.rs\",\"range\":{\"start\":{\"line\":18,\"character\":15},\"end\":{\"line\":18,\"character\":18}}}]}"
[01:44:09] ],
[01:44:09]   expected: [
[01:44:09]     ExpectedMessage {
[01:44:09]         id: Some(
[01:44:09]             1
[01:44:09]         ),
[01:44:09]         contains: [
[01:44:09]             "\"range\":{\"start\":{\"line\":18,\"character\":15},\"end\":{\"line\":18,\"character\":18}}",
[01:44:09]             "\"range\":{\"start\":{\"line\":19,\"character\":12},\"end\":{\"line\":19,\"character\":15}}"
[01:44:09]         ]
[01:44:09]     }
[01:44:09] ]
[01:44:09] thread 'test::test_find_impls' panicked at 'Could not find `"range":{"start":{"line":19,"character":12},"end":{"line":19,"character":15}}` in `{"jsonrpc":"2.0","id":1,"result":[{"uri":"file:///checkout/src/tools/rls/test_data/find_impls/src/main.rs","range":{"start":{"line":18,"character":15},"end":{"line":18,"character":18}}}]}`', libcore/option.rs:917:5
[01:44:09] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:44:09] 
[01:44:09] 
[01:44:09] failures:
[01:44:09]     test::test_find_impls
[01:44:09] 
[01:44:09] test result: FAILED. 39 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out

@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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 14, 2018
@nrc
Copy link
Member

nrc commented Feb 14, 2018

Should be fixed by #48202, testing locally now

@bors
Copy link
Contributor

bors commented Feb 16, 2018

⌛ Testing commit 2bf2d6a with merge 6882a1923603cec739c6e9e759976480936543da...

@bors
Copy link
Contributor

bors commented Feb 16, 2018

💔 Test failed - status-travis

@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 Feb 16, 2018
@kennytm
Copy link
Member

kennytm commented Feb 17, 2018

@bors retry

Try once more. That URL is certainly working for me

@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 Feb 17, 2018
@bors
Copy link
Contributor

bors commented Feb 17, 2018

⌛ Testing commit 2bf2d6a with merge 4270941733f082131058ece149db73634f5e3d30...

@bors
Copy link
Contributor

bors commented Feb 17, 2018

💔 Test failed - status-appveyor

@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 Feb 17, 2018
@kennytm
Copy link
Member

kennytm commented Feb 18, 2018

miri build-fail, legit. Needs to apply 95d5e31 for miri (clippy is test-pass so no need to be skipped).

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

r? @kennytm -- you're more familiar with the check tools script

@kennytm
Copy link
Member

kennytm commented Feb 18, 2018

@bors r+

@bors
Copy link
Contributor

bors commented Feb 18, 2018

📌 Commit 666d385 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 Feb 18, 2018
@bors
Copy link
Contributor

bors commented Feb 18, 2018

⌛ Testing commit 666d385 with merge da1f1b5...

bors added a commit that referenced this pull request Feb 18, 2018
@bors
Auto merge of #48183 - Mark-Simulacrum:beta-next, r=kennytm
da1f1b5 
Beta: bootstrap from 1.24.0 stable.

r? @alexcrichton

I think this is all correct... not sure about Cargo, but seems fine for now, we can always change later.
@bors
Copy link
Contributor

bors commented Feb 18, 2018

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

@bors bors merged commit 666d385 into rust-lang:beta Feb 18, 2018
@cuviper
Copy link
Member

cuviper commented Feb 20, 2018

Is beta publishing enabled? I don't see 1.25 beta in rustup, nor anywhere on static.rlo...

@Mark-Simulacrum
Copy link
Member Author

Mark-Simulacrum commented Feb 20, 2018 •
edited
Loading

It is. The beta build broke during dist on central-station; I haven't yet worked on a fix, or trying to diagnose why this PR succeeded. Should be relatively trivial (probably new beta ~Tuesday/Wednesday).

Edit: beta for 1.25 is out.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kennytm kennytm kennytm left review comments

Assignees

@kennytm kennytm

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Mark-Simulacrum @bors @alexcrichton @kennytm @nrc @cuviper