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

8340671: GHA: Bump macOS and Xcode versions to macos-12 and XCode 13.4.1 #2940

Closed
wants to merge 1 commit into from

Conversation

vieiro
Copy link
Contributor

@vieiro vieiro commented Sep 24, 2024

The macos-11 github runners were deprecated and removed in June 2024 , making the macos tests to hang in openjdk11u-dev (and other OpenJDK repositories).

JDK-8335793 GHA: Bump macOS and Xcode versions upgraded the version #2835 of mac runners to macos-13. This upgrade in github runners required a long list of changes in openjdk11u-dev that proved difficult to review.

In order to ease the review process this PR downgrades the version of github runners in jdk11u-dev from the current macos-13 to macos-12 and xcode-13.4.1. This will require a single backport of JDK-8299254 Support dealing with standard assert macro (a follow-up to this PR), making the review process easier.

Once the github actions are running again in macos-12 an upgrade to macos-13 could be performed, if required, with some more additional PRs.


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
  • JDK-8340671 needs maintainer approval

Issue

  • JDK-8340671: GHA: Bump macOS and Xcode versions to macos-12 and XCode 13.4.1 (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2940/head:pull/2940
$ git checkout pull/2940

Update a local copy of the PR:
$ git checkout pull/2940
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2940/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2940

View PR using the GUI difftool:
$ git pr show -t 2940

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2940.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 24, 2024

👋 Welcome back vieiro! 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
Copy link

openjdk bot commented Sep 24, 2024

@vieiro This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8340671: GHA: Bump macOS and Xcode versions to macos-12 and XCode 13.4.1

Reviewed-by: sgehwolf

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 2 new commits pushed to the master branch:

  • b2d3859: Merge
  • 0358cbd: 8296410: HttpClient throws java.io.IOException: no statuscode in response for HTTP2

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 24, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 24, 2024

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@openjdk
Copy link

openjdk bot commented Sep 25, 2024

⚠️ @vieiro This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@vieiro
Copy link
Contributor Author

vieiro commented Sep 25, 2024

/approval request This is a first step to bring back online the os-x builds and tests in GHA for jdk11u-dev.

@openjdk
Copy link

openjdk bot commented Sep 25, 2024

@vieiro
8340671: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 25, 2024
@openjdk
Copy link

openjdk bot commented Sep 25, 2024

⚠️ @vieiro the full name on your profile does not match the author name in this pull requests' HEAD commit. If this pull request gets integrated then the author name from this pull requests' HEAD commit will be used for the resulting commit. If you wish to push a new commit with a different author name, then please run the following commands in a local repository of your personal fork:

$ git checkout hotfix/JDK-8340671
$ git commit --author='Preferred Full Name <you@example.com>' --allow-empty -m 'Update full name'
$ git push

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Sep 25, 2024
@vieiro
Copy link
Contributor Author

vieiro commented Sep 26, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 26, 2024
@openjdk
Copy link

openjdk bot commented Sep 26, 2024

@vieiro
Your change (at version e7ab1de) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Sep 26, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 26, 2024

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

  • b2d3859: Merge
  • 0358cbd: 8296410: HttpClient throws java.io.IOException: no statuscode in response for HTTP2

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 26, 2024
@openjdk openjdk bot closed this Sep 26, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Sep 26, 2024
@openjdk
Copy link

openjdk bot commented Sep 26, 2024

@jerboaa @vieiro Pushed as commit dd35f18.

💡 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
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants