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

CI: Selecting the Xcode version no longer needed with the macos-11 runners. #89849

Merged
merged 1 commit into from Oct 17, 2021
Merged

CI: Selecting the Xcode version no longer needed with the macos-11 runners. #89849

merged 1 commit into from Oct 17, 2021

Conversation

hkratz
Copy link
Contributor

@hkratz hkratz commented Oct 13, 2021 •
edited

It does nothing nowadays since /Applications/Xcode_12.2.app does not exist in the GH runner environment and
automatically using the latest version selected by the GH environment is better anyway.

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2021
@Mark-Simulacrum
Copy link
Member

If we're going to delete all uses, I think we should delete the script in the same PR. It will be easy to revert this commit if we need to, but otherwise it's pretty likely we'll forget and be confused later down the line.

@Mark-Simulacrum Mark-Simulacrum 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 Oct 14, 2021
@hkratz
Copy link
Contributor Author

hkratz commented Oct 14, 2021

If we're going to delete all uses, I think we should delete the script in the same PR. It will be easy to revert this commit if we need to, but otherwise it's pretty likely we'll forget and be confused later down the line.

@Mark-Simulacrum Script deleted as well and squashed in.

@ehuss
Copy link
Contributor

ehuss commented Oct 14, 2021

Just a note for posterity: To be a little clearer, 12.2 still exists on the 10.15 image. I was a little concerned when testing macOS 11 of removing this since it wasn't clear how the -latest transition would work since github said it would take 8 weeks to roll out fully. However, the default on 10.15 is xcode 12.4, so I think it should be safe to remove regardless. (12.2 was fixed since it was the minimum version needed for aarch64).

@apiraino apiraino added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Oct 14, 2021
@hkratz
Copy link
Contributor Author

hkratz commented Oct 14, 2021 •
edited

It seems that once a repository has transitioned to a new image all subsequent runs are done with the new image, which is sensible.

Without xcode-select the Xcode version used will be automatically upgraded every couple of months. The macos-11/-latest image is currently on Xcode 12.5.1 and will upgrade to 13.0 starting Oct 16.

@hkratz
Copy link
Contributor Author

hkratz commented Oct 14, 2021 •
edited

@rustbot label -S-waiting-on-author +S-waiting-on-review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 14, 2021
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 15, 2021

📌 Commit 8514b00 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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 15, 2021
@JohnTitor JohnTitor mentioned this pull request Oct 16, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 17, 2021
@bors
Auto merge of rust-lang#89968 - JohnTitor:rollup-z51n967, r=JohnTitor
12b5bce 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#89507 (Add `#[repr(i8)]` to `Ordering`)
 - rust-lang#89849 (CI: Selecting the Xcode version no longer needed with the macos-11 runners.)
 - rust-lang#89886 (Update the wasi-libc built with the wasm32-wasi target)
 - rust-lang#89907 (Remove FIXME since there is nothing to be fixed)
 - rust-lang#89943 (clippy::complexity fixes)
 - rust-lang#89953 (Make Option::as_mut const)
 - rust-lang#89958 (Correct small typo)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e92f252 into rust-lang:master Oct 17, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 17, 2021
@ehuss ehuss mentioned this pull request Oct 21, 2021
Merged
@hkratz hkratz deleted the remove-xcode-select branch November 6, 2021 20:37
@ehuss ehuss mentioned this pull request Nov 19, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.57.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@hkratz @rust-highfive @Mark-Simulacrum @ehuss @bors @apiraino @rustbot