Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Aug 21, 2023

There is no need for keyring installation after JDK-8313701. We can simplify that part to reduce the difference between different JDK releases.

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-8314656: GHA: No need for Debian ports keyring installation after JDK-8313701 (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15362

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

Using diff file

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

Webrev

Link to Webrev Comment

@shipilev shipilev changed the title 8314656: GHA: No need for Debian keyring installation after JDK-8313701 8314656: GHA: No need for Debian ports keyring installation after JDK-8313701 Aug 21, 2023
@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 added the rfr Pull request is ready for review label Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 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 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

Webrevs

@shipilev shipilev force-pushed the JDK-8314656-gha-nokeyring branch from e2fef49 to f364f61 Compare August 21, 2023 15:03
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

@shipilev Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

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.

LGTM. Thanks for the cleanup.

@openjdk
Copy link

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

8314656: GHA: No need for Debian ports keyring installation after JDK-8313701

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

  • c418933: 8313530: VM build without C2 fails after JDK-8312579
  • de0e46c: 8303815: Improve Metaspace test speed
  • 3699666: 8313319: [linux] mmap should use MAP_FIXED_NOREPLACE if available
  • 3285a1e: 8314555: Build with mawk fails on Windows
  • 4a50e87: 8303852: current_stack_region() gets called twice unnecessarily
  • c077be4: 8314694: Separate checked_cast from globalDefinitions.hpp
  • 68815d5: 8314734: Remove unused field TypeVariableImpl.EMPTY_ANNOTATION_ARRAY
  • 57a322d: 8308042: [macos] Developer ID Application Certificate not picked up by jpackage if it contains UNICODE characters
  • 38a9edf: 8314679: SA fails to properly attach to JVM after having just detached from a different JVM
  • 2c60cad: 8280743: HSDB "Monitor Cache Dump" command might throw NPE
  • ... and 9 more: https://git.openjdk.org/jdk/compare/2be469f89ec10471e893045e606e1e2558f4e363...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 23, 2023
@shipilev
Copy link
Member Author

Thanks! Last call for reviews. I'll integrate soon otherwise.

@shipilev
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 24, 2023

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

  • e36620d: 8314554: Debian/Ubuntu should not link OpenJDK with --as-needed link option
  • 97b94cb: 8314883: Java_java_util_prefs_FileSystemPreferences_lockFile0 write result errno in missing case
  • 75e19e0: 8314819: [JVMCI] HotSpotJVMCIRuntime.lookupType throws unexpected ClassNotFoundException
  • c418933: 8313530: VM build without C2 fails after JDK-8312579
  • de0e46c: 8303815: Improve Metaspace test speed
  • 3699666: 8313319: [linux] mmap should use MAP_FIXED_NOREPLACE if available
  • 3285a1e: 8314555: Build with mawk fails on Windows
  • 4a50e87: 8303852: current_stack_region() gets called twice unnecessarily
  • c077be4: 8314694: Separate checked_cast from globalDefinitions.hpp
  • 68815d5: 8314734: Remove unused field TypeVariableImpl.EMPTY_ANNOTATION_ARRAY
  • ... and 12 more: https://git.openjdk.org/jdk/compare/2be469f89ec10471e893045e606e1e2558f4e363...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 24, 2023

@shipilev Pushed as commit 76b9011.

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

@shipilev shipilev deleted the JDK-8314656-gha-nokeyring branch August 24, 2023 17:01
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

Development

Successfully merging this pull request may close these issues.

2 participants