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

8325621: Improve jspawnhelper version checks #2592

Closed
wants to merge 1 commit into from

Conversation

chadrako
Copy link
Contributor

@chadrako chadrako commented Jun 15, 2024

Backport JDK-8325621

Clean backport to update jspawnhelper to check that JDK version and jspawnhelper version are the same. Updates test to include check for version. Updated test passes. Already backported to 21 and 22. Risk is low: touches the production code paths but only passes an additional argument to jspawnhelper.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8325621 needs maintainer approval

Issue

  • JDK-8325621: Improve jspawnhelper version checks (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2592

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2024

👋 Welcome back chadrako! 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 Jun 15, 2024

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

8325621: Improve jspawnhelper version checks

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:

  • 0fc9b02: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • d981bc4: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 4cee9be: 8327787: Convert javax/swing/border/Test4129681.java applet test to main

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 (@shipilev) 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 a232e8fb4e6e9e2e9a5285bf01c93b8d1d995f04 8325621: Improve jspawnhelper version checks Jun 15, 2024
@openjdk
Copy link

openjdk bot commented Jun 15, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 15, 2024

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

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

mlbridge bot commented Jun 15, 2024

Webrevs

@chadrako
Copy link
Contributor Author

/approval 8325621 request Clean backport to update jspawnhelper to check that JDK version and jspawnhelper version are the same. Updates test to include check for version. GHA tests pass including the updated test. Risk is low: touches the production code paths but only passes an additional argument to jspawnhelper.

@openjdk
Copy link

openjdk bot commented Jun 16, 2024

@chadrako
8325621: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jun 16, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jun 17, 2024
@chadrako
Copy link
Contributor Author

/integrate

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

openjdk bot commented Jun 17, 2024

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

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

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

  • 0fc9b02: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • d981bc4: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 4cee9be: 8327787: Convert javax/swing/border/Test4129681.java applet test to main

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 17, 2024

@shipilev @chadrako Pushed as commit d056b73.

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

Successfully merging this pull request may close these issues.

2 participants