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

8292717: Clean up checking of testing requirements in configure #1693

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Aug 24, 2023

Prepares build system for cleaner googletest and jtreg dependency updates. After this, at least googletest update applies only with minor conflicts. I expect jtreg updates would be smoother too.

Current backport does not apply cleanly, because prior backports are in the way. So I did this PR by reverting JDK-8292716 and JDK-8292763 fixes, applying this move cleanly, and then reapplying the first two cleanly. Therefore both JDK-8292716 and JDK-8292763 still effectively remain in 17u-dev. See commit history for individual commits. This also makes sure we do not miss anything in backports.

@GoeLin, you might want to take a look.

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-8292717: Clean up checking of testing requirements in configure (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1693

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1693.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 24, 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 16593cf51c3d994ba4a6d28ab97e519dfd53f37b 8292717: Clean up checking of testing requirements in configure Aug 24, 2023
@openjdk
Copy link

openjdk bot commented Aug 24, 2023

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

@openjdk openjdk bot added the backport label Aug 24, 2023
@shipilev shipilev force-pushed the JDK-8292717-version-checks-configure branch from e35844e to a02907d Compare August 25, 2023 06:39
@shipilev shipilev marked this pull request as ready for review August 25, 2023 06:43
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 25, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 25, 2023

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.

LGTM

@openjdk
Copy link

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

8292717: Clean up checking of testing requirements in configure

Reviewed-by: clanger

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 17 new commits pushed to 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 29, 2023
@shipilev
Copy link
Member Author

Review is here. Push approval is granted.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 30, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 30, 2023

@shipilev Pushed as commit 0bc4e7e.

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

@shipilev shipilev deleted the JDK-8292717-version-checks-configure branch December 11, 2023 10:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants