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

8293098: GHA: Harmonize GCC version handling for host and cross builds #10083

Closed
wants to merge 4 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 30, 2022

Caught this headache while trying to bump to Ubuntu 22.04, which required touching way too many surprising places.

Current GHA scripts define apt-gcc-version a bit weirdly: host and cross builds version differ in carrying the "gcc-major-version" inside of it. That is, "host" builds do apt-gcc-version: '10=10.3.0-1ubuntu1~20.04', while cross builds do apt-gcc-version: default: '10.3.0-1ubuntu1~20.04'

I propose we harmonize these to simplify GCC updates: split out the gcc-major-version for host builds, and pull the versions from cross builds into main, where all other versions belong. Additionally, this handles the x86_32 case that requires "-multilib" package, which is currently hacked through the "version" string.

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

Issue

  • JDK-8293098: GHA: Harmonize GCC version handling for host and cross builds

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/10083/head:pull/10083
$ git checkout pull/10083

Update a local copy of the PR:
$ git checkout pull/10083
$ git pull https://git.openjdk.org/jdk pull/10083/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10083

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/10083.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 30, 2022

👋 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 added the rfr Pull request is ready for review label Aug 30, 2022
@openjdk
Copy link

openjdk bot commented Aug 30, 2022

@shipilev The following label will be automatically applied to this pull request:

  • build

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the build build-dev@openjdk.org label Aug 30, 2022
@mlbridge
Copy link

mlbridge bot commented Aug 30, 2022

Webrevs

Copy link
Member

@magicus magicus left a comment

Choose a reason for hiding this comment

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

Seems like a good cleanup. I never fully got to the end of making this part nice when I rewrote the GHA script.

If you want to unify this even more, I think (iirc) that it possible to e.g. set a top-level env section defining the gcc version we use, and reference it in the jobs:*:with sections.

@openjdk
Copy link

openjdk bot commented Aug 30, 2022

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

8293098: GHA: Harmonize GCC version handling for host and cross builds

Reviewed-by: ihse, 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 30 new commits pushed to the master branch:

  • 38377d5: 8291649: multiple tests failing with -Xcomp after JDK-8290034
  • 2d7792c: 8293065: Zero build failure on AArch64 and RISCV64 after JDK-8293007
  • c3380c0: 8292995: improve the SA page cache
  • 1cf245d: 8292590: Product JVM crashes with FLAG_SET_XXX on non-product Flag
  • 6335150: 6205692: (spec) javax.crypto.MacSpi.engineUpdate(ByteBuffer input): NPE should be specified
  • 622be79: 8293090: Remove unused par_oop_since_save_marks_iterate_done
  • 3d0ab2b: 8292858: G1: Remove redundant check in G1FlushHumongousCandidateRemSets
  • 6e24827: 8292878: x86: Make scratch register usage explicit in assembler code
  • f5ebbf3: 8292657: Calling GetLocalXXX from virtual thread with thread parameter set to NULL returns carrier locals
  • 550e5d7: 4958071: (spec) confusing exception list for javax.crypto.Cipher.init(...) for
  • ... and 20 more: https://git.openjdk.org/jdk/compare/a476ec5c81968e9a8cf7fb02f61cc4a5c8c2d520...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 30, 2022
@shipilev
Copy link
Member Author

Seems like a good cleanup. I never fully got to the end of making this part nice when I rewrote the GHA script.

Yeah, I figured :)

If you want to unify this even more, I think (iirc) that it possible to e.g. set a top-level env section defining the gcc version we use, and reference it in the jobs:*:with sections.

I would prefer to do it later, as there are dependent PRs riding on this one, and testing takes quite a while...

@magicus
Copy link
Member

magicus commented Aug 30, 2022

I would prefer to do it later, as there are dependent PRs riding on this one, and testing takes quite a while...

That's up to you. I'm okay with this change as-is.

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. Nice cleanup.

@shipilev
Copy link
Member Author

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Aug 31, 2022

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

  • 38377d5: 8291649: multiple tests failing with -Xcomp after JDK-8290034
  • 2d7792c: 8293065: Zero build failure on AArch64 and RISCV64 after JDK-8293007
  • c3380c0: 8292995: improve the SA page cache
  • 1cf245d: 8292590: Product JVM crashes with FLAG_SET_XXX on non-product Flag
  • 6335150: 6205692: (spec) javax.crypto.MacSpi.engineUpdate(ByteBuffer input): NPE should be specified
  • 622be79: 8293090: Remove unused par_oop_since_save_marks_iterate_done
  • 3d0ab2b: 8292858: G1: Remove redundant check in G1FlushHumongousCandidateRemSets
  • 6e24827: 8292878: x86: Make scratch register usage explicit in assembler code
  • f5ebbf3: 8292657: Calling GetLocalXXX from virtual thread with thread parameter set to NULL returns carrier locals
  • 550e5d7: 4958071: (spec) confusing exception list for javax.crypto.Cipher.init(...) for
  • ... and 20 more: https://git.openjdk.org/jdk/compare/a476ec5c81968e9a8cf7fb02f61cc4a5c8c2d520...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 31, 2022

@shipilev Pushed as commit 923c952.

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

@shipilev shipilev deleted the JDK-8293098-gha-versions branch September 5, 2022 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
3 participants