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

8300264: Remove metaprogramming/isPointer.hpp #2691

Closed
wants to merge 6 commits into from

Conversation

gdams
Copy link
Member

@gdams gdams commented Jul 8, 2024

Prerequisite to bumping gtest, applies cleanly


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8300264 needs maintainer approval

Issue

  • JDK-8300264: Remove metaprogramming/isPointer.hpp (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2691

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 8, 2024

👋 Welcome back gdams! A progress list of the required criteria for merging this PR into pr/2690 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 Jul 8, 2024

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

8300264: Remove metaprogramming/isPointer.hpp

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 changed the title Backport eba87a0ee0410f61ae764293986ecc162f48c707 8300264: Remove metaprogramming/isPointer.hpp Jul 8, 2024
@openjdk
Copy link

openjdk bot commented Jul 8, 2024

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

@openjdk openjdk bot added backport clean rfr Pull request is ready for review labels Jul 8, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 8, 2024

Webrevs

@openjdk openjdk bot mentioned this pull request Jul 8, 2024
4 tasks
@gdams
Copy link
Member Author

gdams commented Jul 8, 2024

/approval request This backport applies cleanly. All tests pass. This is also crucial to allow us to upgrade the GH actions workflow to move away from the deprecated macos-11 VMs.

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

@gdams
8300264: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jul 8, 2024
@openjdk openjdk bot removed the approval label Jul 9, 2024
@gdams gdams changed the base branch from pr/2690 to master July 9, 2024 07:37
@openjdk openjdk bot removed the clean label Jul 9, 2024
@openjdk
Copy link

openjdk bot commented Jul 9, 2024

@gdams this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout isPointer
git fetch https://git.openjdk.org/jdk17u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

⚠️ @gdams This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jul 9, 2024
@openjdk openjdk bot added clean ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Jul 9, 2024
@gdams
Copy link
Member Author

gdams commented Jul 9, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jul 9, 2024

Going to push as commit 5d5ca9c.

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

openjdk bot commented Jul 9, 2024

@gdams Pushed as commit 5d5ca9c.

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

@gdams gdams deleted the isPointer branch July 10, 2024 10:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant