Skip to content

[beta] Prepare the 1.23.0 beta release #46140

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
Nov 21, 2017
Merged

Conversation

alexcrichton
Copy link
Member

  • Update the release channel config
  • Update the bootstrap compiler to the dev stable build
  • Update the cargo submodule to its master branch

* Update the release channel config
* Update the bootstrap compiler to the dev stable build
* Update the cargo submodule to its master branch
@alexcrichton
Copy link
Member Author

r? @kennytm

@kennytm
Copy link
Member

kennytm commented Nov 21, 2017

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

📌 Commit e11100d has been approved by kennytm

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

⌛ Testing commit e11100d with merge a071627799d25caec0f5c76b76d0dcbfa83c6a40...

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Nov 21, 2017

Err what? The dist jobs cannot run rustdoc after building stage2-rustdoc.

[00:42:51] error: the option `Z` is only accepted on the nightly compiler
[00:42:51] 
[00:42:51] thread '<unnamed>' panicked at 'Box<Any>', /checkout/src/librustc/session/mod.rs:930:4
[00:42:51] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[00:42:51] 
[00:42:51] 
[00:42:51] command did not execute successfully: "/checkout/obj/build/bootstrap/debug/rustdoc" "--html-after-content" "/checkout/src/doc/footer.inc" "--html-before-content" "/checkout/obj/build/powerpc64-unknown-linux-gnu/doc/version_info.html" "--html-in-header" "/checkout/src/doc/favicon.inc" "--markdown-playground-url" "https://play.rust-lang.org/" "-o" "/checkout/obj/build/powerpc64-unknown-linux-gnu/doc" "/checkout/src/doc/guide-testing.md" "--markdown-css" "rust.css"
[00:42:51] expected success, got: exit code: 101
[00:42:51] 
[00:42:51] 
[00:42:51] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host powerpc64-unknown-linux-gnu --target powerpc64-unknown-linux-gnu
[00:42:51] Build completed unsuccessfully in 0:40:44

@kennytm kennytm added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Nov 21, 2017
I believe this was forgotten from rust-lang#45191 but hopefully is a simple fix!
@alexcrichton
Copy link
Member Author

@kennytm I think that's this commit (af4a78b), we can land that on master if it works.

@bors: r=kennytm

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

📌 Commit 46f81b3 has been approved by kennytm

@kennytm kennytm 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 Nov 21, 2017
@bors
Copy link
Collaborator

bors commented Nov 21, 2017

⌛ Testing commit 46f81b3 with merge 7f4ea8d...

bors added a commit that referenced this pull request Nov 21, 2017
[beta] Prepare the 1.23.0 beta release

* Update the release channel config
* Update the bootstrap compiler to the dev stable build
* Update the cargo submodule to its master branch
@bors
Copy link
Collaborator

bors commented Nov 21, 2017

💔 Test failed - status-appveyor

@kennytm
Copy link
Member

kennytm commented Nov 21, 2017

RLS test failure at test_deglob @nrc.

It panics with

Could not find "new_text":"{Stdout, Stdin}"

where the input contains

"new_text":"{Stdin, Stdout}"

failures:
---- test::test_deglob stdout ----
	expect_messages:
  results: [
    "{\"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\"]}}}}",
    "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/beginBuild\",\"params\":null}",
    "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/diagnosticsBegin\",\"params\":null}",
    "{\"jsonrpc\":\"2.0\",\"method\":\"rustDocument/diagnosticsEnd\",\"params\":null}"
],
  expected: [
    ExpectedMessage {
        id: Some(
            0
        ),
        contains: [
            "rls.deglobImports"
        ]
    },
    ExpectedMessage {
        id: None,
        contains: [
            "beginBuild"
        ]
    },
    ExpectedMessage {
        id: None,
        contains: [
            "diagnosticsBegin"
        ]
    },
    ExpectedMessage {
        id: None,
        contains: [
            "diagnosticsEnd"
        ]
    }
]
expect_messages:
  results: [
    "{\"jsonrpc\":\"2.0\",\"id\":100,\"result\":[{\"title\":\"Deglob Import\",\"command\":\"rls.deglobImports\",\"arguments\":[{\"location\":{\"range\":{\"end\":{\"character\":14,\"line\":12},\"start\":{\"character\":13,\"line\":12}},\"uri\":\"file:///C:/projects/rust/src/tools/rls/test_data/deglob/src/main.rs\"},\"new_text\":\"{Stdin, Stdout}\"}]}]}"
],
  expected: [
    ExpectedMessage {
        id: Some(
            100
        ),
        contains: [
            "\"title\":\"Deglob Import\"",
            "\"command\":\"rls.deglobImports\"",
            "{\"location\":{\"range\":{\"end\":{\"character\":14,\"line\":12},\"start\":{\"character\":13,\"line\":12}},\"uri\":",
            "deglob/src/main.rs\"}",
            "\"new_text\":\"{Stdout, Stdin}\""
        ]
    }
]
thread 'test::test_deglob' panicked at 'Could not find `"new_text":"{Stdout, Stdin}"` in `{"jsonrpc":"2.0","id":100,"result":[{"title":"Deglob Import","command":"rls.deglobImports","arguments":[{"location":{"range":{"end":{"character":14,"line":12},"start":{"character":13,"line":12}},"uri":"file:///C:/projects/rust/src/tools/rls/test_data/deglob/src/main.rs"},"new_text":"{Stdin, Stdout}"}]}]}`', src\libcore\option.rs:874:4
failures:
    test::test_deglob
test result: FAILED. 27 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
error: test failed, to rerun pass '--bin rls'

@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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 21, 2017
@alexcrichton
Copy link
Member Author

@bors: r=kennytm

@bors
Copy link
Collaborator

bors commented Nov 21, 2017

📌 Commit af4a78b has been approved by kennytm

@kennytm kennytm 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 Nov 21, 2017
@bors
Copy link
Collaborator

bors commented Nov 21, 2017

⌛ Testing commit af4a78b with merge 082b0ff...

bors added a commit that referenced this pull request Nov 21, 2017
[beta] Prepare the 1.23.0 beta release

* Update the release channel config
* Update the bootstrap compiler to the dev stable build
* Update the cargo submodule to its master branch
@bors
Copy link
Collaborator

bors commented Nov 21, 2017

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

@bors bors merged commit af4a78b into rust-lang:beta Nov 21, 2017
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants