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

8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup #170

Conversation

andrew-m-leonard
Copy link

@andrew-m-leonard andrew-m-leonard commented Feb 18, 2022

This PR backports the fix for resolving the --with-cacerts-src variable correctly as part of https://bugs.openjdk.java.net/browse/JDK-8278080.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/170/head:pull/170
$ git checkout pull/170

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 170

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/170.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Feb 18, 2022

👋 Welcome back aleonard! 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 45da3aea22fd85f214e661b2c98631cb91ddb55d 8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup Feb 18, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Feb 18, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr labels Feb 18, 2022
@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 18, 2022

This is the PR to backport https://bugs.openjdk.java.net/browse/JDK-8278163 to resolve the issue for the already merged dependent PR for https://bugs.openjdk.java.net/browse/JDK-8278080.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 18, 2022

Webrevs

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 18, 2022

I've patched this PR to correctly mirror the head stream fix: https://github.com/openjdk/jdk/pull/6680/files
which Skara incorrectly created due to the dependent PR code change not being in master when the PR was created.

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 22, 2022

Can I get a review of this backport please?
The only reason it's not clean is because the Skara backport was created incorrectly as the dependent code which this fixes was not merged at that time (https://bugs.openjdk.java.net/browse/JDK-8278080), and thus the backport did not apply the 3 lines deletion part of the original upstream fix because those lines did not exist at that time.

Copy link
Contributor

@jerboaa jerboaa left a comment

The reason this is not clean is the copyright change. The original change didn't include it: openjdk/jdk@45da3ae

Remove it and it'll show up as clean :)

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 22, 2022

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
@openjdk openjdk bot added the clean label Feb 22, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Feb 22, 2022

@andrew-m-leonard 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:

8278163: --with-cacerts-src variable resolved after GenerateCacerts recipe setup

Reviewed-by: sgehwolf

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:

  • 5de8b78: 8277488: Add expiry exception for Digicert (geotrustglobalca) expiring in May 2022
  • f7f0b31: 8270117: Broken jtreg link in "Building the JDK" page
  • cf55b1b: 8279695: [TESTBUG] modify compiler/loopopts/TestSkeletonPredicateNegation.java to run on C1 also

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Feb 22, 2022
@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 22, 2022

@jerboaa thanks that's done the trick :-)

Copy link
Contributor

@jerboaa jerboaa left a comment

You don't need the review, but it looks good to me anyway :)

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 23, 2022

/integrate

@openjdk openjdk bot added the sponsor label Feb 23, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Feb 23, 2022

@andrew-m-leonard
Your change (at version 7dbf382) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Feb 23, 2022

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Feb 23, 2022

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

  • 0c6e662: 8277383: VM.metaspace optionally show chunk freelist details
  • 9bb8b7f: 8271721: Split gc/g1/TestMixedGCLiveThreshold into separate tests
  • 5de8b78: 8277488: Add expiry exception for Digicert (geotrustglobalca) expiring in May 2022
  • f7f0b31: 8270117: Broken jtreg link in "Building the JDK" page
  • cf55b1b: 8279695: [TESTBUG] modify compiler/loopopts/TestSkeletonPredicateNegation.java to run on C1 also

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Feb 23, 2022
@openjdk openjdk bot closed this Feb 23, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Feb 23, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Feb 23, 2022

@jerboaa @andrew-m-leonard Pushed as commit 56f0c53.

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

@andrew-m-leonard
Copy link
Author

@andrew-m-leonard andrew-m-leonard commented Feb 23, 2022

Thank you @jerboaa

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
2 participants