Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Oct 3, 2021

Clean backport to unbreak 17u GHA. InfoOpts test fails there, currently.

Additional testing:

  • InfoOptsTest passes locally
  • InfoOptsTest passes in GHA

Progress

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

Issue

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 143

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 4, 2021

👋 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 267c61a16a916e35762e8df5737ec74b06defae8 8273361: InfoOptsTest is failing in tier1 Oct 4, 2021
@openjdk
Copy link

openjdk bot commented Oct 4, 2021

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Oct 4, 2021
@openjdk
Copy link

openjdk bot commented Oct 4, 2021

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

8273361: InfoOptsTest is failing in tier1

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 1 new commit pushed to the master branch:

  • 2490386: 8271287: jdk/jshell/CommandCompletionTest.java fails with "lists don't have the same size expected"

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.

➡️ 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 Oct 4, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 4, 2021

Webrevs

@shipilev
Copy link
Member Author

shipilev commented Oct 4, 2021

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Oct 4, 2021

Going to push as commit 58487fb.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 2490386: 8271287: jdk/jshell/CommandCompletionTest.java fails with "lists don't have the same size expected"

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 4, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 4, 2021
@openjdk
Copy link

openjdk bot commented Oct 4, 2021

@shipilev Pushed as commit 58487fb.

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

@shipilev shipilev deleted the JDK-8273361 branch October 5, 2021 17:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant