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

8318039: GHA: Bump macOS and Xcode versions #16171

Closed

Conversation

vidmik
Copy link
Contributor

@vidmik vidmik commented Oct 12, 2023

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8318039: GHA: Bump macOS and Xcode versions (Enhancement - P4)

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

@vidmik vidmik changed the title Draft: 8318039: GHA: Bump macOS and Xcode versions 8318039: GHA: Bump macOS and Xcode versions Oct 12, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Oct 12, 2023

👋 Welcome back mikael! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 12, 2023
@openjdk
Copy link

openjdk bot commented Oct 12, 2023

@vidmik The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Oct 12, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 12, 2023

Webrevs

@prrace
Copy link
Contributor

prrace commented Oct 12, 2023

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
Copy link
Member

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.

Copy link
Member

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.

@openjdk
Copy link

openjdk bot commented Oct 12, 2023

@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:

8318039: GHA: Bump macOS and Xcode versions

Reviewed-by: erikj, prr, ihse, clanger

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 master branch:

  • 45b7aed: 8317433: Async UL: Only grab lock once when write():ing
  • 266636d: 8315940: ARM32: Move field resolution information out of the cpCache
  • e490cf9: 8317432: Async UL: Use memcpy instead of strcpy in Message ctr
  • 126f2ac: 8318006: remove unused net related coding
  • 4d90420: 8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
  • 1082c0e: 8317677: Specialize Vtablestubs::entry_for() for VtableBlob
  • ec310fe: 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
  • ff0b397: 8317959: Check return values of malloc in native java.base coding
  • c88b387: 8317987: C2 recompilations cause high memory footprint
  • 993951b: 8316464: 3 sun/tools tests ignore VM flags
  • ... and 6 more: https://git.openjdk.org/jdk/compare/9728e21db1b35e487c562690de659aac386aa99d...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 12, 2023
@vidmik
Copy link
Contributor Author

vidmik commented Oct 13, 2023

Thank you for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Oct 13, 2023

Going to push as commit 605c976.
Since your change was applied there have been 18 commits pushed to the master branch:

  • 6273ab9: 8317808: HTTP/2 stream cancelImpl may leave subscriber registered
  • 7d31146: 8318028: Remove unused class="centered" from FocusCycle.svg
  • 45b7aed: 8317433: Async UL: Only grab lock once when write():ing
  • 266636d: 8315940: ARM32: Move field resolution information out of the cpCache
  • e490cf9: 8317432: Async UL: Use memcpy instead of strcpy in Message ctr
  • 126f2ac: 8318006: remove unused net related coding
  • 4d90420: 8315026: ProcessHandle implementation listing processes on AIX should use getprocs64
  • 1082c0e: 8317677: Specialize Vtablestubs::entry_for() for VtableBlob
  • ec310fe: 8317919: pthread_attr_init handle return value and destroy pthread_attr_t object
  • ff0b397: 8317959: Check return values of malloc in native java.base coding
  • ... and 8 more: https://git.openjdk.org/jdk/compare/9728e21db1b35e487c562690de659aac386aa99d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 13, 2023
@openjdk openjdk bot closed this Oct 13, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 13, 2023
@openjdk
Copy link

openjdk bot commented Oct 13, 2023

@vidmik Pushed as commit 605c976.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

5 participants