-
Notifications
You must be signed in to change notification settings - Fork 5.7k
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
8318039: GHA: Bump macOS and Xcode versions #16171
Conversation
👋 Welcome back mikael! A progress list of the required criteria for merging this PR into |
Looks OK, but best to wait for the GHA for this to finish ... |
@@ -132,7 +132,7 @@ jobs: | |||
run: | | |||
# On macOS we need to install some dependencies for testing | |||
brew install make | |||
sudo xcode-select --switch /Applications/Xcode_11.7.app/Contents/Developer |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interesting that this didn't match the version we are using. Someone more versed in GHA could perhaps make this use the xcode-toolset-version
instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're not passing xcode-toolset-version
into test.yml. :( We could start doing that, possibly, but we have never sent platform-specific arguments to test.yml before. In any case we'd still have to repeat the xcode-toolset-version
in main.yml, but it would at least keep the version info to main.yml, so I guess it would be an improvement.
@vidmik This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 16 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Thank you for the reviews! /integrate |
Going to push as commit 605c976.
Your commit was automatically rebased without conflicts. |
In GHA, the versions of macOS (note: the version used for build/test, not the target macOS version we compile for) and Xcode are starting to show age. It's time to update to more modern versions.
This change bumps the macOS to 13 (from 11) and Xcode to 14.3.1 (from 12.5.1/11.7). This is a prerequisite change for JDK-8317970 / #16155, without which the build SIGSEGVs (presumably some since-fixed issue in Xcode 12.5.1).
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/16171/head:pull/16171
$ git checkout pull/16171
Update a local copy of the PR:
$ git checkout pull/16171
$ git pull https://git.openjdk.org/jdk.git pull/16171/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 16171
View PR using the GUI difftool:
$ git pr show -t 16171
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/16171.diff
Webrev
Link to Webrev Comment