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

8276130: Fix Github Actions of JDK17u to account for update version scheme #218

Closed
wants to merge 1 commit into from

Conversation

RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Oct 28, 2021

With the release of 17.0.1, the version number of jdk17u now does not only contain the feature part but also interim and update. This fix will unbreak github actions.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8276130: Fix Github Actions of JDK17u to account for update version scheme

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u pull/218/head:pull/218
$ git checkout pull/218

Update a local copy of the PR:
$ git checkout pull/218
$ git pull https://git.openjdk.java.net/jdk17u pull/218/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 218

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u/pull/218.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 28, 2021

👋 Welcome back clanger! 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 JDK-8276130 8276130: Fix Github Actions of JDK17u to account for update version scheme Oct 28, 2021
@openjdk openjdk bot added the rfr label Oct 28, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 28, 2021

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Seems straightforward, and you tested it, right?

Could this be broken down into multiple lines? (no problem if not, change is fine as it is).

Cheers, Thomas

@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

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

8276130: Fix Github Actions of JDK17u to account for update version scheme

Reviewed-by: stuefe

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:

  • 22f1513: 8273575: memory leak in appendBootClassPath(), paths must be deallocated
  • 38bfd62: 8273965: some testlibrary_tests/ir_framework tests fail when c1 disabled
  • f0fb814: 8174819: java/nio/file/WatchService/LotsOfEvents.java fails intermittently
  • 08cee6f: 8275104: IR framework does not handle client VM builds correctly

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 the ready label Oct 29, 2021
@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Oct 29, 2021

Seems straightforward, and you tested it, right?

Could this be broken down into multiple lines? (no problem if not, change is fine as it is).

Cheers, Thomas

Thanks for the review. Yes, it's tested & working - you can see it in this PR or here: https://github.com/RealCLanger/jdk17u/actions/runs/1394411607

There's no currently open PR in here where GHA was configured and you could see the error. But, for comparison, a currently failing run can be seen in the SapMachine repository: https://github.com/SAP/SapMachine/actions/runs/1397068578

I'm matching the code of jdk11u with this PR. I agree it would probably be nicer to break the lines but I would do it in a separate PR and backport it to 11 as well.

@RealCLanger
Copy link
Contributor Author

@RealCLanger RealCLanger commented Oct 29, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

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

  • 22f1513: 8273575: memory leak in appendBootClassPath(), paths must be deallocated
  • 38bfd62: 8273965: some testlibrary_tests/ir_framework tests fail when c1 disabled
  • f0fb814: 8174819: java/nio/file/WatchService/LotsOfEvents.java fails intermittently
  • 08cee6f: 8275104: IR framework does not handle client VM builds correctly

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 29, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 29, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 29, 2021

@RealCLanger Pushed as commit 25bfea6.

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

@RealCLanger RealCLanger deleted the fix-gha-version branch Nov 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated
2 participants