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

8294310: compare.sh fails on macos after JDK-8293550 #359

Closed
wants to merge 1 commit into from

Conversation

phohensee
Copy link
Member

@phohensee phohensee commented Dec 7, 2022

Clean backport of required follow-on to 17u backport of JDK-8293550.


Progress

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

Issue

  • JDK-8294310: compare.sh fails on macos after JDK-8293550

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 359

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 7, 2022

👋 Welcome back phh! 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 b9eeec2b6b8f97d2ba33462b27d091f918067f78 8294310: compare.sh fails on macos after JDK-8293550 Dec 7, 2022
@openjdk
Copy link

openjdk bot commented Dec 7, 2022

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

@openjdk
Copy link

openjdk bot commented Dec 7, 2022

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

8294310: compare.sh fails on macos after JDK-8293550

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 added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 7, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 7, 2022

Webrevs

@phohensee
Copy link
Member Author

Neglected to enable workflows on this fork before creating this PR, but this PR is identical to openjdk/jdk17u-dev#944, for which the pre-submit tests succeeded.

@phohensee
Copy link
Member Author

/integrate

Got the approval.

@openjdk
Copy link

openjdk bot commented Dec 8, 2022

Going to push as commit d84c61c.

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

openjdk bot commented Dec 8, 2022

@phohensee Pushed as commit d84c61c.

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

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
1 participant