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

8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960 #18475

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Mar 25, 2024

When doing JDK-8326960, I missed the case when sysroot would be restored from the cache. This would skip the configure and build steps, because it would only consult the status for create-sysroot job. This is only a problem when PR gets tested the second time, the first time we would always create a sysroot. I only noticed this after merging the master into existing PRs.

This is a regression that might hide build issues on platforms, and so it should be fixed ASAP.

Additional testing:

  • GHA first run: cross-compiled builds run
  • GHA second run: cross-compiled builds run

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-8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960 (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18475

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 25, 2024

👋 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 Mar 25, 2024

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

8328948: GHA: Restoring sysroot from cache skips the build after JDK-8326960

Reviewed-by: clanger, ihse

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

  • 907e30f: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket
  • 70a15c7: 8328825: Google CAInterop test failures
  • a1fbbff: 8328717: Convert javax/swing/JColorChooser/8065098/bug8065098.java applet test to main

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
Copy link

openjdk bot commented Mar 25, 2024

@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 Mar 25, 2024
@shipilev shipilev force-pushed the JDK-8328948-gha-restore-sysroot-fail branch from 66b6dc2 to 93cca96 Compare March 25, 2024 15:43
@shipilev shipilev marked this pull request as ready for review March 25, 2024 16:25
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 25, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 25, 2024

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.

That looks correct.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 25, 2024
@shipilev
Copy link
Member Author

Second GHA run compiles cross-builds fully. I will integrate and backport this soon, so that we don't miss build failures in the interim.

@shipilev
Copy link
Member Author

I am integrating without waiting for the rest of GHA to complete, in order to line up backports.

/integrate

@openjdk
Copy link

openjdk bot commented Mar 25, 2024

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

  • c7cf602: 8328385: Convert java/awt/FileDialog/FileDialogReturnTest test to main
  • 78d1b90: 8328380: Remove applet usage from JColorChooser tests Test6348456
  • 907e30f: 8325579: Inconsistent behavior in com.sun.jndi.ldap.Connection::createSocket
  • 70a15c7: 8328825: Google CAInterop test failures
  • a1fbbff: 8328717: Convert javax/swing/JColorChooser/8065098/bug8065098.java applet test to main

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 25, 2024

@shipilev Pushed as commit 447436e.

💡 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
build build-dev@openjdk.org integrated Pull request has been integrated
3 participants