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 #2835

Closed
wants to merge 1 commit into from

Conversation

vieiro
Copy link
Contributor

@vieiro vieiro commented Jul 5, 2024

A backport of JDK-8318039 to update GHA to the newest macos/XCode versions.

This in preparation of JDK-8296812 (i.e., all macos builds that are currently hanging now will fail until JDK-8296812 is in place).


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-8318039 needs maintainer approval

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2835

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 5, 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 Jul 5, 2024

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

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

8318039: GHA: Bump macOS and Xcode versions

Reviewed-by: andrew

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 (@gnu-andrew) 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 changed the title Backport 605c9767291ddf1c409c3e805ffb3182899d06c2 8318039: GHA: Bump macOS and Xcode versions Jul 5, 2024
@openjdk
Copy link

openjdk bot commented Jul 5, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jul 5, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 5, 2024

Webrevs

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Change looks good. Not clean, as 11u skipped JDK-8301097, but that's fine.

I would get this one in first so we at least have Mac OS builds again, even if they are failing. That will allow more people to fix the build issues.

@openjdk
Copy link

openjdk bot commented Jul 5, 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 Jul 6, 2024

/approval request Upgrade GHA to macos-13 as macos-11 is not longer available. Macos builds will still continue to fail until backports for XCode 14/15 are in place, but at least they won't hang.

@openjdk
Copy link

openjdk bot commented Jul 6, 2024

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

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

vieiro commented Jul 7, 2024

/integrate

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

openjdk bot commented Jul 7, 2024

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

@openjdk openjdk bot mentioned this pull request Jul 7, 2024
4 tasks
@gdams
Copy link
Member

gdams commented Jul 9, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

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

  • b005573: 8331798: Remove unused arg of checkErgonomics() in TestMaxHeapSizeTools.java
  • e3ff295: 8333804: java/net/httpclient/ForbiddenHeadTest.java threw an exception with 0 failures
  • 9b44a2a: 8222884: ConcurrentClassDescLookup.java times out intermittently

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 9, 2024
@openjdk openjdk bot closed this Jul 9, 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 Jul 9, 2024
@openjdk
Copy link

openjdk bot commented Jul 9, 2024

@gdams @vieiro Pushed as commit 82e2866.

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

Successfully merging this pull request may close these issues.

3 participants