Skip to content

Conversation

@alexeysemenyukoracle
Copy link
Member

@alexeysemenyukoracle alexeysemenyukoracle commented Oct 18, 2025

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 27883

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/27883.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 18, 2025

👋 Welcome back asemenyuk! 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
Copy link

openjdk bot commented Oct 18, 2025

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

8370156: Fix jpackage IconTest

Reviewed-by: almatvee

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 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
Copy link

openjdk bot commented Oct 18, 2025

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

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch core-libs [email protected] labels Oct 18, 2025
@openjdk
Copy link

openjdk bot commented Oct 18, 2025

@alexeysemenyukoracle The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 18, 2025
@mlbridge
Copy link

mlbridge bot commented Oct 18, 2025

Webrevs

@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Oct 18, 2025
@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as draft October 20, 2025 13:36
@openjdk openjdk bot removed the rfr Pull request is ready for review label Oct 20, 2025
@alexeysemenyukoracle alexeysemenyukoracle force-pushed the JDK-8370156 branch 2 times, most recently from 4d43f93 to 3216ddb Compare October 21, 2025 06:42
@alexeysemenyukoracle alexeysemenyukoracle marked this pull request as ready for review October 22, 2025 04:22
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 22, 2025
@alexeysemenyukoracle
Copy link
Member Author

@sashamatveev PTAL

Copy link
Member

@sashamatveev sashamatveev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 22, 2025
@alexeysemenyukoracle
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 22, 2025

Going to push as commit 3e20a93.
Since your change was applied there have been 20 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 22, 2025

@alexeysemenyukoracle Pushed as commit 3e20a93.

💡 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

core-libs [email protected] integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants