Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Aug 21, 2023

Unclean backport to improve GHA stability. The conflict is due to RISC-V GHA changes of the slightly different form in 17u: does not have explicit keyring handling blocks. That block is going away with another clean up upstream, so I just resolved the conflict to only update the debian-repository itself.

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-8313701: GHA: RISC-V should use the official repository for bootstrap (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1680

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1680.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.

@openjdk openjdk bot changed the title Backport 538f9557b87f750264231f04bfbc91d15f8af8c0 8313701: GHA: RISC-V should use the official repository for bootstrap 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.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Aug 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

Webrevs

@openjdk
Copy link

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

8313701: GHA: RISC-V should use the official repository for bootstrap

Reviewed-by: phh

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

  • e830464: 8314552: Fix javadoc tests to work with jtreg 7
  • 49ffbcf: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • d35a896: 8293851: hs_err should print more stack in hex dump
  • 3f8e995: 8314658: [17u] GHA: Sync up debian-version for cross-builds
  • 994f16f: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 74a12fc: 8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java

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 21, 2023
@shipilev
Copy link
Member Author

Push approval granted. RISC-V sysroot creation should be fixed after we integrate another PR, mentioned above.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 25, 2023

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

  • e070c31: 8283724: Incorrect description for jtreg-failure-handler option
  • 40add10: 8299827: Add resolved IP address in connection exception for sockets
  • e830464: 8314552: Fix javadoc tests to work with jtreg 7
  • 49ffbcf: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • d35a896: 8293851: hs_err should print more stack in hex dump
  • 3f8e995: 8314658: [17u] GHA: Sync up debian-version for cross-builds
  • 994f16f: 8310873: Re-enable locked_create_entry symbol check in runtime/NMT/CheckForProperDetailStackTrace.java for RISC-V
  • 74a12fc: 8314117: RISC-V: Incorrect VMReg encoding in RISCV64Frame.java

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 25, 2023

@shipilev Pushed as commit e84d9dd.

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

@shipilev shipilev deleted the JDK-8313701-gha-risc-official branch December 11, 2023 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants