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

8325194: GHA: Add macOS M1 testing #2697

Closed
wants to merge 6 commits into from
Closed

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 9, 2024

Now that macOS M1 executors are available in GitHub actions it makes sense to move the build to run on M1 (rather than cross-compiled) and also enable testing on the platform.

Applies cleanly other than the following:

  • .github/actions/get-jtreg/action.yml I also integrated openjdk/jdk@3c91b59 as it caused a regression in tip
  • make/conf/github-actions.conf having the obvious difference in version numbers for the boot JDK (I also took the liberty of reordering them to be consistent with tip)

Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8325194 needs maintainer approval
  • Commit message must refer to an issue
  • JDK-8325444 needs maintainer approval
  • JDK-8309934 needs maintainer approval

Issues

  • JDK-8325194: GHA: Add macOS M1 testing (Enhancement - P4 - Approved)
  • JDK-8325444: GHA: JDK-8325194 causes a regression (Bug - P3 - Approved)
  • JDK-8309934: Update GitHub Actions to use JDK 17 for building jtreg (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2697

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 9, 2024

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

@gdams
Copy link
Member Author

gdams commented Jul 9, 2024

/issue add 8325444

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

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

8325194: GHA: Add macOS M1 testing
8325444: GHA: JDK-8325194 causes a regression
8309934: Update GitHub Actions to use JDK 17 for building jtreg

Reviewed-by: mbaesken

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

  • 05bea0e: 8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automatic main test
  • 7dcb608: 8255898: Test java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java fails on Mac OS
  • c915eaf: 8280982: [Wayland] [XWayland] java.awt.Robot taking screenshots
  • 3d83f3e: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads

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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot changed the title Backport d1c82156ba6ede4b798ac15f935289cfcc99d1a0 8325194: GHA: Add macOS M1 testing Jul 9, 2024
@openjdk
Copy link

openjdk bot commented Jul 9, 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 9, 2024
@openjdk
Copy link

openjdk bot commented Jul 9, 2024

@gdams
Adding additional issue to issue list: 8325444: GHA: JDK-8325194 causes a regression.

@mlbridge
Copy link

mlbridge bot commented Jul 9, 2024

Webrevs

@gdams
Copy link
Member Author

gdams commented Jul 9, 2024

/issue add 8309934

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

@gdams
Adding additional issue to issue list: 8309934: Update GitHub Actions to use JDK 17 for building jtreg.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2667 to master July 10, 2024 08:17
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout macos14
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jul 10, 2024

@gdams this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout macos14
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jul 10, 2024
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jul 10, 2024
@openjdk
Copy link

openjdk bot commented Jul 10, 2024

⚠️ @gdams 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.

@gdams
Copy link
Member Author

gdams commented Jul 10, 2024

/approval request backport applies cleanly (except for obvious boot JDK URL changes), affects CI only

@openjdk
Copy link

openjdk bot commented Jul 10, 2024

@gdams
8325194: The approval request has been created successfully.
8325444: The approval request has been created successfully.
8309934: 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 10, 2024
@gdams
Copy link
Member Author

gdams commented Jul 11, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jul 11, 2024

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

  • 05bea0e: 8328158: Convert java/awt/Choice/NonFocusablePopupMenuTest to automatic main test
  • 7dcb608: 8255898: Test java/awt/FileDialog/FilenameFilterTest/FilenameFilterTest.java fails on Mac OS
  • c915eaf: 8280982: [Wayland] [XWayland] java.awt.Robot taking screenshots
  • 3d83f3e: 8329109: Threads::print_on() tries to print CPU time for terminated GC threads

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 11, 2024

@gdams Pushed as commit cfe714b.

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

@gdams gdams deleted the macos14 branch July 11, 2024 08:03
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
2 participants