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 #1640

Closed
wants to merge 6 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 4, 2023

This is a series of commits that bring 17u GHA close to mainline. The root change is Ubuntu 22.04 bump, but that one could not be tested alone, because GHA would be broken due to missing compilers, dependencies, etc. Therefore, I opted to do a bulk PR that contains a series of inter-dependent changes. This PR should bring 17u GHA to the good state, atomically.

The included changes are in separate commits, if you want to review them separately. But it would be easier to see the changes against JDK 22 GHA. There are differences against JDK 22 GHA, but those look minor, not breaking/fixing current GHA, and we can backport separately once we get JDK 17u GHA in shape.

Additional testing:


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-8313428: GHA: Bump GCC versions for July 2023 updates (Enhancement - P4)
  • JDK-8313707: GHA: Bootstrap sysroots with --variant=minbase (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1640

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 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.

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

openjdk bot commented Aug 4, 2023

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

@openjdk openjdk bot added the backport label Aug 4, 2023
@shipilev
Copy link
Member Author

shipilev commented Aug 4, 2023

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

@openjdk
Copy link

openjdk bot commented Aug 4, 2023

@shipilev
Adding additional issue to issue list: 8293098: GHA: Harmonize GCC version handling for host and cross builds.
This issue is referenced in the PR title - it will now be updated.

Adding additional issue to issue list: 8293361: GHA: dump config.log in case of configure failure.

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

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

Adding additional issue to issue list: 8313707: GHA: Bootstrap sysroots with --variant=minbase.

@shipilev
Copy link
Member Author

shipilev commented Aug 4, 2023

@RealCLanger, @TheRealMDoerr -- this approach makes sense to you? If so, I'll mark this PR ready for review. It would add the PR links to all affected issues, which I don't want to do unless we are going forward with this PR.

@RealCLanger
Copy link
Contributor

@RealCLanger, @TheRealMDoerr -- this approach makes sense to you? If so, I'll mark this PR ready for review. It would add the PR links to all affected issues, which I don't want to do unless we are going forward with this PR.

Yep, that makes sense. Thanks for the work, happy to review it.

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

mlbridge bot commented Aug 7, 2023

Webrevs

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 to me. Thanks for bringing GHA in 17u up to date.

@openjdk
Copy link

openjdk bot commented Aug 7, 2023

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

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
8313428: GHA: Bump GCC versions for July 2023 updates
8313707: GHA: Bootstrap sysroots with --variant=minbase

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 7, 2023
@shipilev
Copy link
Member Author

shipilev commented Aug 7, 2023

Thanks! I added 17u fix requests on all issues.

@GoeLin
Copy link
Member

GoeLin commented Aug 7, 2023

Please see my comment in JDK-8293107

@shipilev
Copy link
Member Author

The discussion seem to be resolved. The recent GHA run is clean.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 14, 2023

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

  • d7b3306: 8310551: vmTestbase/nsk/jdb/interrupt/interrupt001/interrupt001.java timed out due to missing prompt
  • 6ab5177: 8308090: Add container tests for on-the-fly resource quota updates
  • 10942c1: 8156889: ListKeychainStore.sh fails in some virtualized environments
  • 8683db8: 8308232: nsk/jdb tests don't pass -verbose flag to the debuggee
  • 38204b0: 8289646: configure script failed on WSL
  • 762c351: 8273092: Sort classlist in JDK image
  • fe9b7c6: 8255548: Missing coverage for javax.xml.crypto.dom.DOMCryptoContext
  • 242513f: 6381945: (cal) Japanese calendar unit test system should avoid multiple static imports
  • 3d86810: 8307079: Update test java/awt/Choice/DragOffNoSelect.java
  • 8aad696: 8301167: Update VerifySignedJar to actually exercise and test verification
  • ... and 7 more: https://git.openjdk.org/jdk17u-dev/compare/482f2241da4d5d60c74e493c77fe7d9d11b1e753...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 14, 2023

@shipilev Pushed as commit 260f287.

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

@shipilev shipilev deleted the JDK-MULTI-gha-fixes branch August 24, 2023 15:44
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
3 participants