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] promote release #116362

Merged
merged 3 commits into from
Oct 3, 2023
Merged

[beta] promote release #116362

merged 3 commits into from
Oct 3, 2023

Conversation

Mark-Simulacrum
Copy link
Member

@rustbot
Copy link
Collaborator

rustbot commented Oct 2, 2023

⚠️ 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!

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc O-unix Operating system: Unix-like O-windows Operating system: Windows S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 2, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 2, 2023

📌 Commit 9b40b3b has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 2, 2023
@bors
Copy link
Contributor

bors commented Oct 3, 2023

⌛ Testing commit 9b40b3b with merge 45c37a3...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2023
…k-Simulacrum

[beta] promote release

r? `@Mark-Simulacrum`
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Oct 3, 2023

💔 Test failed - checks-actions

@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 3, 2023
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 3, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+

Set RUSTC_BOOTSTRAP on test executions as well.

@bors
Copy link
Contributor

bors commented Oct 3, 2023

📌 Commit c69c79f has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 3, 2023
@bors
Copy link
Contributor

bors commented Oct 3, 2023

⌛ Testing commit c69c79f with merge 1754565...

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 3, 2023
…k-Simulacrum

[beta] promote release

r? `@Mark-Simulacrum`
@rust-log-analyzer

This comment has been minimized.

@bors
Copy link
Contributor

bors commented Oct 3, 2023

💔 Test failed - checks-actions

@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 3, 2023
@Mark-Simulacrum
Copy link
Member Author

getenv("RUSTC_BOOTSTRAP") doesn't work from emscripten code because environment variables are not passed through by default (https://emscripten.org/docs/porting/connecting_cpp_and_javascript/Interacting-with-code.html?highlight=getenv#environment-variables). I believe this is new in the promoting beta because we started custom rendering libtest, requiring a -Z flag to the libtest invocation.

This is an annoying problem, I'm not sure if there are great workarounds for it. wasm32-unknown-emscripten is a tier 2 platform though so us running tests for it is sort of ... weird anyway. We might want to reconsider that.

This should fix running tests on the emscripten target. In the future
it's expected we'll want to entirely remove this builder since it's a
tier 2 target, but for this initially beta-targeted patch keeping the
changes minimal is preferred.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Oct 3, 2023

📌 Commit 2c34a58 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@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 3, 2023
@bors
Copy link
Contributor

bors commented Oct 3, 2023

⌛ Testing commit 2c34a58 with merge b5c050f...

@bors
Copy link
Contributor

bors commented Oct 3, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing b5c050f to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2023
@bors bors merged commit b5c050f into rust-lang:beta Oct 3, 2023
11 checks passed
@rustbot rustbot added this to the 1.74.0 milestone Oct 3, 2023
@Mark-Simulacrum Mark-Simulacrum deleted the beta-backport branch October 4, 2023 00:19
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 4, 2023
…emscripten, r=Kobzol

Remove wasm32-unknown-emscripten tests from CI

This builder tested the wasm32-unknown-emscripten target, which is tier 2 (and so not eligible for testing). In the recent beta [promotion](rust-lang#116362 (comment)), we ran into a problem with this target: emscripten doesn't support passing environment variables into the std environment, so we can't enable RUSTC_BOOTSTRAP for libtest in order to pass -Zunstable-options.

We worked around this for the beta/stable branches, but given this problem, and its tier 2 status, just dropping the target's tests entirely seems warranted. Downgrading to tier 3 may also be a good idea, but that is a separate conversation not proposed here.
bors-ferrocene bot added a commit to ferrocene/ferrocene that referenced this pull request Oct 9, 2023
34: Automated pull from upstream `beta` r=pietroalbini a=github-actions[bot]


This PR pulls the following changes from the upstream repository:

* rust-lang/rust#116362



Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
Co-authored-by: bors <bors@rust-lang.org>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-unix Operating system: Unix-like O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants