Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Conversation

@backwaterred
Copy link

@backwaterred backwaterred commented Apr 20, 2023

Backport of this patch to address build errors on xlclang v16 build errors after Harfbuzz upgrade.


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.org/jdk20u.git pull/57/head:pull/57
$ git checkout pull/57

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 57

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk20u/pull/57.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 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 310aa9347861922af5f0311e9e93a5f49dee6adc 8304291: [AIX] Broken build after JDK-8301998 Apr 20, 2023
@openjdk
Copy link

openjdk bot commented Apr 20, 2023

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

@openjdk
Copy link

openjdk bot commented Apr 20, 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:

8304291: [AIX] Broken build after JDK-8301998

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:

  • 6db9050: 8297587: Upgrade JLine to 3.22.0

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 Apr 20, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 20, 2023

Webrevs

@backwaterred
Copy link
Author

/integrate

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

openjdk bot commented Apr 24, 2023

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

@shipilev
Copy link
Member

Looks fine. The push approval is there.

/integrate

@shipilev
Copy link
Member

Um.

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 24, 2023

@shipilev Only the author (@backwaterred) is allowed to issue the integrate command. As this pull request is ready to be sponsored, and you are an eligible sponsor, did you mean to issue the /sponsor command?

@openjdk
Copy link

openjdk bot commented Apr 24, 2023

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

  • b63e16e: 8306543: GHA: MSVC installation is failing
  • 6db9050: 8297587: Upgrade JLine to 3.22.0

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 24, 2023
@openjdk openjdk bot closed this Apr 24, 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 Apr 24, 2023
@openjdk
Copy link

openjdk bot commented Apr 24, 2023

@shipilev @backwaterred Pushed as commit c0604cb.

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

@backwaterred
Copy link
Author

Thanks @shipilev :-)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport clean integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants