Skip to content

8325194: GHA: Add macOS M1 testing #238

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

Closed
wants to merge 3 commits into from
Closed

8325194: GHA: Add macOS M1 testing #238

wants to merge 3 commits into from

Conversation

gdams
Copy link
Member

@gdams gdams commented Feb 6, 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.


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

Issues

  • JDK-8325194: GHA: Add macOS M1 testing (Enhancement - P4 - Approved)
  • JDK-8325444: GHA: JDK-8325194 causes a regression (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 238

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 6, 2024

👋 Welcome back gdams! 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 changed the title Backport d1c82156ba6ede4b798ac15f935289cfcc99d1a0 8325194: GHA: Add macOS M1 testing Feb 6, 2024
@openjdk
Copy link

openjdk bot commented Feb 6, 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 Feb 6, 2024
@gdams
Copy link
Member Author

gdams commented Feb 6, 2024

@shipilev still seeing the same error:

realpath: bootjdk/jdk: No such file or directory

I'm slightly confused but I'll do some investigation

@mlbridge
Copy link

mlbridge bot commented Feb 6, 2024

Webrevs

@shipilev
Copy link
Member

shipilev commented Feb 6, 2024

We really need to figure out what is missing in JDK repos for this, instead of diverging. We are waiting for https://bugs.openjdk.org/browse/JDK-8324723 to land first to get the msys2 update...

@RealCLanger
Copy link
Contributor

You should inline the backport of https://bugs.openjdk.org/browse/JDK-8325444 into this. And wait for https://bugs.openjdk.org/browse/JDK-8324723 of course.

@shipilev
Copy link
Member

shipilev commented Feb 9, 2024

...and by "inline", I think it would be better to revert this PR to original state, add another commit carrying https://bugs.openjdk.org/browse/JDK-8325444, and say /issue add JDK-8325444. This would make this PR an atomic 2-commit backport.

@gdams
Copy link
Member Author

gdams commented Feb 11, 2024

/issue add JDK-8325444

@openjdk
Copy link

openjdk bot commented Feb 11, 2024

@gdams Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Feb 11, 2024

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

@gdams
Copy link
Member Author

gdams commented Feb 12, 2024

The test failures will be fixed by merging #254

@gdams
Copy link
Member Author

gdams commented Feb 12, 2024

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

@openjdk
Copy link

openjdk bot commented Feb 12, 2024

@gdams
8325194: The approval request has been created successfully.
8325444: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Feb 12, 2024
@gdams
Copy link
Member Author

gdams commented Feb 13, 2024

You should inline the backport of https://bugs.openjdk.org/browse/JDK-8325444 into this. And wait for https://bugs.openjdk.org/browse/JDK-8324723 of course.

I've added the second backport. As for waiting for JDK-8324723, I don't think this is necessary anymore as the build/test is passing in it's current state. CC @shipilev?

@shipilev
Copy link
Member

JDK-8324723

Yes, I don't think it needs to wait for JDK-8324723.

@jerboaa
Copy link
Contributor

jerboaa commented Feb 13, 2024

/approve yes

@openjdk
Copy link

openjdk bot commented Feb 13, 2024

@jerboaa
8325194: The approval request has been approved.
8325444: The approval request has been approved.

@openjdk
Copy link

openjdk bot commented Feb 13, 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

Reviewed-by: shade

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

  • 4031ff4: 8324753: [AIX] adjust os_posix after JDK-8318696
  • b0e9a61: 8323671: DevKit build gcc libraries contain full paths to source location
  • 5f32918: 8323667: Library debug files contain non-reproducible full gcc include paths

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 added ready Pull request is ready to be integrated and removed approval labels Feb 13, 2024
@gdams
Copy link
Member Author

gdams commented Feb 13, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Feb 13, 2024

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

  • 4031ff4: 8324753: [AIX] adjust os_posix after JDK-8318696
  • b0e9a61: 8323671: DevKit build gcc libraries contain full paths to source location
  • 5f32918: 8323667: Library debug files contain non-reproducible full gcc include paths

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 13, 2024

@gdams Pushed as commit b9cf41d.

💡 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.

4 participants