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

8293107: GHA: Bump to Ubuntu 22.04 #2090

Closed
wants to merge 8 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 21, 2023

This similar to the bulk GHA update we did here: shipilev/jdk17u-dev@260f287 -- but now for 11u.

Note this reverts and then reapplies JDK-8284772 to avoid backport conflicts.

There are other GHA improvements we would backport later. This one atomic PR brings in 11u GHA closer to mainline GHA state without breaking the builds. For reference, after this PR, the 11u-vs-mainline GHA diff would be this: gha-11u-vs-mainline.patch


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

Issues

  • JDK-8293107: GHA: Bump to Ubuntu 22.04 (Enhancement - P4)
  • JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds (Enhancement - P4)
  • JDK-8293361: GHA: dump config.log in case of configure failure (Bug - P4)
  • JDK-8295213: Run GHA manually with user-specified make and configure arguments (Enhancement - P4)
  • JDK-8295885: GHA: Bump gcc versions (Enhancement - P4)
  • JDK-8313428: GHA: Bump GCC versions for July 2023 updates (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2090

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2023

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

@shipilev
Copy link
Member Author

/issue add 8293098,8293361,8293107,8295213,8295885,8313428

@openjdk
Copy link

openjdk bot commented Aug 21, 2023

@shipilev
Adding additional issue to issue list: 8293098: GHA: Harmonize GCC version handling for host and cross builds.

Adding additional issue to issue list: 8293361: GHA: dump config.log in case of configure failure.
This issue is referenced in the PR title - it will now be updated.

Adding additional issue to issue list: 8295213: Run GHA manually with user-specified make and configure arguments.

Adding additional issue to issue list: 8295885: GHA: Bump gcc versions.

Adding additional issue to issue list: 8313428: GHA: Bump GCC versions for July 2023 updates.

@shipilev shipilev changed the title 8293107: GHA: Bump to Ubuntu 22.04 Backport d7536588b38e368eaa6395bcbcc6724a39303fc5 Aug 21, 2023
@openjdk openjdk bot changed the title Backport d7536588b38e368eaa6395bcbcc6724a39303fc5 8293107: GHA: Bump to Ubuntu 22.04 Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

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

@tstuefe
Copy link
Member

tstuefe commented Aug 21, 2023

What is the reason for this PR, reducing maintenance by reducing delta to upstream?

I would slightly prefer testing 11u on older systems with older glibcs (20.04 still rocks 2.31, which predates mallinfo2() for instance).

@shipilev shipilev marked this pull request as ready for review August 21, 2023 12:57
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Aug 21, 2023

We had the longer discussion about this already in the RFE itself.

What is the reason for this PR, reducing maintenance by reducing delta to upstream?

Yes.

This is how you look at it: GHA is not under our control. When GHA infra changes, it changes globally for all JDK releases currently in testing. Therefore, the sane way to maintain GHA across JDK release repos is to keep it in sync as much as possible. That's what we did in 17u, and this is what we have to do in 11u, lest somebody is signing up to maintain the diverged 11u GHA going forward.

I would slightly prefer testing 11u on older systems with older glibcs (20.04 still rocks 2.31, which predates mallinfo2() for instance).

We cannot do toolchain compatibility testing with GHA, because GHA infra is not under our control. If we keep old GHA code, the testing would first slow down, then it would start sporadically break on the way to EOL, and then it would completely break. Which also means we would be forced to do this sync anyway.

@mrserb
Copy link
Member

mrserb commented Aug 22, 2023

Will this change causes the same breakages we had when the minor version of gcc was changed? I prefer to ignore that minor number in GA.

@shipilev
Copy link
Member Author

Will this change causes the same breakages we had when the minor version of gcc was changed? I prefer to ignore that minor number in GA.

In current form, yes, that's a risk that is shared with mainline, 21u, 17u, and until recently 11u GHAs. It would still be there until we backport the GHA change that drops the minor GCC version from all GHAs.

@shipilev
Copy link
Member Author

Will this change causes the same breakages we had when the minor version of gcc was changed? I prefer to ignore that minor number in GA.

In current form, yes, that's a risk that is shared with mainline, 21u, 17u, and until recently 11u GHAs. It would still be there until we backport the GHA change that drops the minor GCC version from all GHAs.

Actually, we should just reapply JDK-8284772 on top, so minor versions get eliminated again. I just approved JDK-8284772 for inclusion in mainline, which should eliminate the 11u vs mainline difference again.

@shipilev
Copy link
Member Author

I think we should proceed with this. Can I have some formal reviews?

Copy link
Contributor

@RealCLanger RealCLanger left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, thanks for the effort. Please add approval labels.

@openjdk
Copy link

openjdk bot commented Aug 29, 2023

@shipilev This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8293107: GHA: Bump to Ubuntu 22.04
8293098: GHA: Harmonize GCC version handling for host and cross builds
8293361: GHA: dump config.log in case of configure failure
8295213: Run GHA manually with user-specified make and configure arguments
8295885: GHA: Bump gcc versions
8313428: GHA: Bump GCC versions for July 2023 updates

Reviewed-by: clanger

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

  • c86ba43: 8312972: Bump update version for OpenJDK: jdk-11.0.22
  • 39986e0: 8314086: [11u] A typo in the fix for JDK-8312462 is causing test failure in ChildAlwaysOnTopTest.java
  • 749ecd5: Merge
  • fffaff3: 8313765: Invalid CEN header (invalid zip64 extra data field size)
  • 1b3c516: 8314678: Bump update version for OpenJDK: jdk-11.0.20.1
  • 89a88f0: 8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
  • e1b839e: 8302182: Update Public Suffix List to 88467c9
  • 81806b7: 8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612
  • 2bfbe31: 8295737: macOS: Print content cut off when width > height with portrait orientation
  • 2b9f562: 8217612: (CL)HSDB cannot show some JVM flags
  • ... and 7 more: https://git.openjdk.org/jdk11u-dev/compare/a7dab960a4e3b9709f0668b7b06eb2513c3bef3a...master

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 Pull request is ready to be integrated label Aug 29, 2023
@shipilev
Copy link
Member Author

Looks good, thanks for the effort. Please add approval labels.

Thanks! I think I marked all mentioned issues now.

@shipilev
Copy link
Member Author

Got the push approval for all issues now. Integrating to make GHA more reliable.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

  • c86ba43: 8312972: Bump update version for OpenJDK: jdk-11.0.22
  • 39986e0: 8314086: [11u] A typo in the fix for JDK-8312462 is causing test failure in ChildAlwaysOnTopTest.java
  • 749ecd5: Merge
  • fffaff3: 8313765: Invalid CEN header (invalid zip64 extra data field size)
  • 1b3c516: 8314678: Bump update version for OpenJDK: jdk-11.0.20.1
  • 89a88f0: 8276651: java/lang/ProcessHandle tests fail with "RuntimeException: Input/output error" in java.lang.ProcessHandleImpl$Info.info0
  • e1b839e: 8302182: Update Public Suffix List to 88467c9
  • 81806b7: 8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612
  • 2bfbe31: 8295737: macOS: Print content cut off when width > height with portrait orientation
  • 2b9f562: 8217612: (CL)HSDB cannot show some JVM flags
  • ... and 7 more: https://git.openjdk.org/jdk11u-dev/compare/a7dab960a4e3b9709f0668b7b06eb2513c3bef3a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2023

@shipilev Pushed as commit b984b0a.

💡 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
4 participants