-
Couldn't load subscription status.
- Fork 6.1k
8370156: Fix jpackage IconTest #27883
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
8370156: Fix jpackage IconTest #27883
Conversation
|
👋 Welcome back asemenyuk! A progress list of the required criteria for merging this PR into |
|
@alexeysemenyukoracle 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: 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 20 new commits pushed to the
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 |
|
@alexeysemenyukoracle this pull request can not be integrated into git checkout JDK-8370156
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
@alexeysemenyukoracle The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
|
@sashamatveev PTAL |
4d43f93 to
3216ddb
Compare
3216ddb to
9bf7e44
Compare
|
@sashamatveev PTAL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
|
/integrate |
|
Going to push as commit 3e20a93.
Your commit was automatically rebased without conflicts. |
|
@alexeysemenyukoracle Pushed as commit 3e20a93. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Rework IconTest.
Verified it produces the output as expected.
It still will not catch JDK-8370155. However, this is deliberate to avoid significant changes in the test and implementation in a single commit.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/27883/head:pull/27883$ git checkout pull/27883Update a local copy of the PR:
$ git checkout pull/27883$ git pull https://git.openjdk.org/jdk.git pull/27883/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 27883View PR using the GUI difftool:
$ git pr show -t 27883Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27883.diff
Using Webrev
Link to Webrev Comment