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] backports #121069

Merged
merged 9 commits into from
Feb 16, 2024
Merged

[beta] backports #121069

merged 9 commits into from
Feb 16, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Feb 14, 2024 •
edited
Loading

r? cuviper

androm3da and others added 5 commits February 13, 2024 20:52
@androm3da @cuviper
Correct paths for hexagon-unknown-none-elf platform doc
0e09fe1 
Update the library paths to correctly refer to libdemo{1,2}_hexagon
and switch to the release build instead.

Update references to libstandalone to the specific G0/PIC archive instead.

(cherry picked from commit 647a453)
@ehuss @cuviper
CI: Use ninja on apple builders
1412627 
(cherry picked from commit 2aebe6c)
@GuillaumeGomez @cuviper
Correctly check never_type feature gating
53320b2 
(cherry picked from commit 2c0030f)
@GuillaumeGomez @cuviper
Update never_type feature gate ui test
9ae7a36 
(cherry picked from commit 0f21e45)
@oli-obk @cuviper
Revert unsound libcore changes of rust-lang#119911
a686e61 
(cherry picked from commit 6ac035d)
@rustbot
Copy link
Collaborator

rustbot commented Feb 14, 2024

⚠️ 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 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 Feb 14, 2024
@cuviper cuviper linked an issue Feb 14, 2024 that may be closed by this pull request
miri: checked_pow: overflowing shift by 64 in unchecked_shl #120537
Closed
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Feb 14, 2024
@cuviper
Copy link
Member Author

cuviper commented Feb 14, 2024

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Feb 14, 2024

📌 Commit 2fdfacc has been approved by cuviper

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 Feb 14, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@cuviper
Copy link
Member Author

cuviper commented Feb 14, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Feb 14, 2024

📌 Commit a686e61 has been approved by cuviper

It is now in the queue for this repository.

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 14, 2024
@bors
Auto merge of rust-lang#121069 - cuviper:beta-next, r=cuviper
b87b0a3 
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562

r? cuviper
@bors
Copy link
Contributor

bors commented Feb 14, 2024

⌛ Testing commit a686e61 with merge b87b0a3...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Feb 14, 2024

💔 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 Feb 14, 2024
@cuviper
Copy link
Member Author

cuviper commented Feb 14, 2024

@bors retry

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 14, 2024
@bors
Copy link
Contributor

bors commented Feb 15, 2024

💔 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 Feb 15, 2024
@cuviper
Copy link
Member Author

cuviper commented Feb 15, 2024

Looks like we need #120914 too!

@ehuss @cuviper
Downgrade Xcode from the default (15.0) to 14.3.1.
533019d 
This seems to fix two sporadic errors that have been appearing in CI.
One is an issue with cmake being unable to verify that cmake is able to
build a simple test program. The other is a `invalid r_symbolnum`
linking error when trying to build one of cranelift's tests.

This is intended as a temporary fix until we can figure out how to
resolve those issues.

(cherry picked from commit 4fd3cf9)
@ehuss @cuviper
Require that SELECT_XCODE is set.
5df5175 
Allowing the Xcode version to "float" based on whatever default GitHub
selects creates an unreliable environment. When GitHub changes the
default, we can have multiple jobs in the same run using different
versions as it rolls out across machines. It can also cause oscillation
between runs as different machines are used. It also causes
unpredictable timing when the updates happen.

This change helps ensure that the version that is used is pinned. The
downside is that it requires manually bumping the version, and the risk
that if we take too long, older Xcodes will be removed and that will
break the build.

(cherry picked from commit 4ce1f1c)
@cuviper cuviper mentioned this pull request Feb 15, 2024
Merged
@cuviper
Copy link
Member Author

cuviper commented Feb 15, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Feb 15, 2024

📌 Commit 5df5175 has been approved by cuviper

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 Feb 15, 2024
@bors
Copy link
Contributor

bors commented Feb 15, 2024

⌛ Testing commit 5df5175 with merge 240c211...

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 15, 2024
@bors
Auto merge of rust-lang#121069 - cuviper:beta-next, r=cuviper
240c211 
[beta] backports

- Correct paths for hexagon-unknown-none-elf platform doc rust-lang#120533
- CI: Use ninja on apple builders rust-lang#120543
- Correctly check `never_type` feature gating rust-lang#120552
- Revert unsound libcore changes of 119911 rust-lang#120562
- Downgrade xcode rust-lang#120914

r? cuviper
@bors
Copy link
Contributor

bors commented Feb 15, 2024

💥 Test timed out

@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 15, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
petrochenkov and others added 2 commits February 15, 2024 10:54
@petrochenkov @cuviper
Update jobserver-rs to 0.1.28
131e1fc 
(cherry picked from commit 83f3bc4)
@nikic @cuviper
Update LLVM submodule
20d17c4 
(cherry picked from commit 7e1897c)
@cuviper cuviper mentioned this pull request Feb 15, 2024
Closed
@cuviper
Copy link
Member Author

cuviper commented Feb 15, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Feb 15, 2024

📌 Commit 20d17c4 has been approved by cuviper

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 Feb 15, 2024
@bors
Copy link
Contributor

bors commented Feb 16, 2024

⌛ Testing commit 20d17c4 with merge d783f37...

@bors
Copy link
Contributor

bors commented Feb 16, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing d783f37 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 16, 2024
@bors bors merged commit d783f37 into rust-lang:beta Feb 16, 2024
12 checks passed
@rustbot rustbot added this to the 1.77.0 milestone Feb 16, 2024
@cuviper cuviper mentioned this pull request Feb 28, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.77.0
Development

Successfully merging this pull request may close these issues.

miri: checked_pow: overflowing shift by 64 in unchecked_shl
10 participants
@cuviper @rustbot @bors @rust-log-analyzer @androm3da @ehuss @GuillaumeGomez @oli-obk @petrochenkov @nikic