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

8342988: GHA: Build JTReg in single step #1269

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 18, 2024

Makes sure GHA is more reliable: we do not risk failures when building jtreg multiple times, and it also allows us to compile it once on x86, without bothering with different arch JDKs.

The original PR does not apply cleanly, because Alpine support added by JDK-8282944 is not in JDK 21. I have resolved the block by hand.

Additional testing:

  • GHA

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

Issue

  • JDK-8342988: GHA: Build JTReg in single step (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1269

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 18, 2024

👋 Welcome back shade! 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 Dec 18, 2024

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

8342988: GHA: Build JTReg in single step

Reviewed-by: serb, phh

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:

  • 0d8d8e6: 8336942: Improve test coverage for class loading elements with annotations of different retentions
  • f117cb0: 8345684: OperatingSystemMXBean.getSystemCpuLoad() throws NPE

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 88dc655a6d6cfc71c467405b62bd35beeed7794f 8342988: GHA: Build JTReg in single step Dec 18, 2024
@openjdk
Copy link

openjdk bot commented Dec 18, 2024

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

@openjdk openjdk bot added the backport label Dec 18, 2024
@shipilev shipilev force-pushed the JDK-8342988-jtreg-one-step branch from f6ed0b3 to 8fe45ca Compare January 8, 2025 09:39
@shipilev shipilev marked this pull request as ready for review January 8, 2025 11:29
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 8, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 8, 2025

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 9, 2025

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

@shipilev
Copy link
Member Author

shipilev commented Jan 9, 2025

/approval request Makes sure GHA is more reliable: we do not risk failures when building jtreg multiple times, and it also allows us to compile it once on x86, without bothering with different arch JDKs. Does not apply cleanly, because Alpine changes are missing in 21u. Otherwise clean, GHA tests pass. Risk is low, GHA-only change.

@openjdk
Copy link

openjdk bot commented Jan 9, 2025

@shipilev
8342988: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 9, 2025
@GoeLin
Copy link
Member

GoeLin commented Jan 10, 2025

It would be great if this reduces the wget failures!!!

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jan 10, 2025
@shipilev
Copy link
Member Author

It would be great if this reduces the wget failures!!!

Right? :) In mainline, the failures are still happening occasionally, but at least they fail in the first minute, so you can restart the testing right away.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2025

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

  • 0d8d8e6: 8336942: Improve test coverage for class loading elements with annotations of different retentions
  • f117cb0: 8345684: OperatingSystemMXBean.getSystemCpuLoad() throws NPE

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2025

@shipilev Pushed as commit 6e6f8b2.

💡 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