Skip to content

Conversation

@backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Jul 25, 2023

Fixes this build error--associated with Harfbuzz--in jdk17. T1 Testing looks good.


Progress

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

Issue

  • JDK-8307603: [AIX] Broken build after JDK-8307301 (Bug - P3)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1624

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 25, 2023

👋 Welcome back tsteele! 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 bb3e44d8b604b4e3facc4f49f625cc0b7ff2abd7 8307603: [AIX] Broken build after JDK-8307301 Jul 25, 2023
@openjdk
Copy link

openjdk bot commented Jul 25, 2023

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 Jul 25, 2023
@openjdk
Copy link

openjdk bot commented Jul 25, 2023

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

8307603: [AIX] Broken build after JDK-8307301

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 10 new commits pushed to the master branch:

  • d44c446: 8309746: Reconfigure check should include make/conf/version-numbers.conf
  • ba17497: 8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
  • aaf47b3: 8307526: [JFR] Better handling of tampered JFR repository
  • 2940973: 8301367: Add exception handler method to the BaseLdapServer
  • 7d29233: 8299617: CurrencySymbols.properties is missing the copyright notice
  • 61442ce: 8296384: [TESTBUG] sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently timeout
  • 89b4429: 8293177: Verify version numbers in legal files
  • 9ed5671: 8289510: Improve test coverage for XPath Axes: namespace
  • 2a70aaa: 8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
  • 90202ef: 8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 25, 2023
@mlbridge
Copy link

mlbridge bot commented Jul 25, 2023

Webrevs

@backwaterred
Copy link
Contributor Author

JBS approval received.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 1, 2023
@openjdk
Copy link

openjdk bot commented Aug 1, 2023

@backwaterred
Your change (at version fd80d23) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 1, 2023

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

  • d44c446: 8309746: Reconfigure check should include make/conf/version-numbers.conf
  • ba17497: 8289917: Metadata for regionsRefilled of G1EvacuationStatistics event is wrong
  • aaf47b3: 8307526: [JFR] Better handling of tampered JFR repository
  • 2940973: 8301367: Add exception handler method to the BaseLdapServer
  • 7d29233: 8299617: CurrencySymbols.properties is missing the copyright notice
  • 61442ce: 8296384: [TESTBUG] sun/security/provider/SecureRandom/AbstractDrbg/SpecTest.java intermittently timeout
  • 89b4429: 8293177: Verify version numbers in legal files
  • 9ed5671: 8289510: Improve test coverage for XPath Axes: namespace
  • 2a70aaa: 8270331: [TESTBUG] Error: Not a test or directory containing tests: java/awt/print/PrinterJob/InitToBlack.java
  • 90202ef: 8307165: java/awt/dnd/NoFormatsDropTest/NoFormatsDropTest.java timed out

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 1, 2023
@openjdk openjdk bot closed this Aug 1, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Aug 1, 2023
@openjdk
Copy link

openjdk bot commented Aug 1, 2023

@phohensee @backwaterred Pushed as commit b4c8cc8.

💡 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 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.

2 participants