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

8293816: CI: ciBytecodeStream::get_klass() is not consistent #1388

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Oct 4, 2022

I backport this for parity with 11.0.18-oracle.]

Required follow up of 8293044


Progress

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

Issue

  • JDK-8293816: CI: ciBytecodeStream::get_klass() is not consistent

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1388

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 4, 2022

👋 Welcome back goetz! 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.

@GoeLin GoeLin changed the title Goetz backport 8293816 Backport 746f5f589db5c1036f15fa47f8a48b2a12c921ce Oct 4, 2022
@openjdk openjdk bot changed the title Backport 746f5f589db5c1036f15fa47f8a48b2a12c921ce 8293816: CI: ciBytecodeStream::get_klass() is not consistent Oct 4, 2022
@openjdk
Copy link

openjdk bot commented Oct 4, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Oct 4, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 4, 2022

Webrevs

@GoeLin GoeLin changed the base branch from master to pr/1384 October 4, 2022 19:44
@openjdk openjdk bot added the clean label Oct 4, 2022
@GoeLin
Copy link
Member Author

GoeLin commented Oct 5, 2022

Pre-submit tests: Problem with change this depends on. That is fixed.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1384 to master October 10, 2022 09:20
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8293816
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean label Oct 10, 2022
@openjdk
Copy link

openjdk bot commented Oct 10, 2022

@GoeLin 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 goetz_backport_8293816
git fetch https://git.openjdk.org/jdk11u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Oct 10, 2022
@openjdk openjdk bot added the clean label Oct 10, 2022
@openjdk
Copy link

openjdk bot commented Oct 10, 2022

@GoeLin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8293816: CI: ciBytecodeStream::get_klass() is not consistent

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 and removed merge-conflict Pull request has merge conflict with target branch labels Oct 10, 2022
@openjdk-notifier
Copy link

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@openjdk-notifier
Copy link

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@GoeLin
Copy link
Member Author

GoeLin commented Oct 10, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 10, 2022

Going to push as commit 18d8559.

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

openjdk bot commented Oct 10, 2022

@GoeLin Pushed as commit 18d8559.

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

@GoeLin GoeLin deleted the goetz_backport_8293816 branch February 8, 2023 16:23
@GoeLin GoeLin restored the goetz_backport_8293816 branch February 8, 2023 16:23
@GoeLin GoeLin deleted the goetz_backport_8293816 branch February 8, 2023 16:25
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