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

8313707: GHA: Bootstrap sysroots with --variant=minbase #15140

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 3, 2023

We don't need the fully bootable Debian installation to build against. Therefore, we can bootstrap with --variant=minbase. The sysroots are about 5..10% smaller then.

This would also make our builds more immune to issues like JDK-8313701. Note how RISC-V GHAs are fixed with this PR by dodging the systemd dependency failure.

Additional testing:

  • GHA cross-compilation builds

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-8313707: GHA: Bootstrap sysroots with --variant=minbase (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15140

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 3, 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
Copy link

openjdk bot commented Aug 3, 2023

@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 3, 2023
@shipilev shipilev marked this pull request as ready for review August 3, 2023 18:01
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 3, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 3, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 4, 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:

8313707: GHA: Bootstrap sysroots with --variant=minbase

Reviewed-by: clanger, fyang

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

  • 61c58fd: 8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
  • 5d23295: 8313251: Add NativeLibraryLoad event
  • c4b8574: 8311938: Add default cups include location for configure on AIX
  • 10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
  • e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • d60352e: 8311006: missing @SInCE info in jdk.xml.dom
  • 4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
  • bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
  • 0f2fce7: 8313632: ciEnv::dump_replay_data use fclose
  • ab1c212: 8312909: C1 should not inline through interface calls with non-subtype receiver

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

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Looks reasonable to me (Not a build expert). Thanks.

@shipilev
Copy link
Member Author

shipilev commented Aug 4, 2023

Thanks! I am integrating to unbreak GHA.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 4, 2023

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

  • 61c58fd: 8312976: MatchResult produces StringIndexOutOfBoundsException for groups outside match
  • 5d23295: 8313251: Add NativeLibraryLoad event
  • c4b8574: 8311938: Add default cups include location for configure on AIX
  • 10a2605: 8294979: test/jdk/tools/jlink 3 test classes use ASM library
  • e8c325d: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • d60352e: 8311006: missing @SInCE info in jdk.xml.dom
  • 4577147: 8313712: [BACKOUT] 8313632: ciEnv::dump_replay_data use fclose
  • bb3aac6: 8301606: JFileChooser file chooser details view "size" label cut off in Metal Look&Feel
  • 0f2fce7: 8313632: ciEnv::dump_replay_data use fclose
  • ab1c212: 8312909: C1 should not inline through interface calls with non-subtype receiver

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 4, 2023

@shipilev Pushed as commit 29f1d8e.

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

@shipilev shipilev deleted the JDK-8313707-gha-minbase branch August 10, 2023 08:57
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