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

8256182: Update qemu-debootstrap cross-compilation recipe #589

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Nov 5, 2021

Unclean backport to improve cross-build implementation. The uncleanliness comes from the fact that 11u builds are in linux-aarch64-*normal*-server-release, so the hunks do not apply cleanly. I just accepted the hunks from the mainline patch and added "normal" manually.

Original change was to match the docs with what we run in GHA. The same motivation holds for 11u.


Progress

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

Issue

  • JDK-8256182: Update qemu-debootstrap cross-compilation recipe

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/589/head:pull/589
$ git checkout pull/589

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 589

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/589.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 5, 2021

👋 Welcome back shade! 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 421a7c3b41343e60d52b6d9ee263dfd0a4d53ce1 8256182: Update qemu-debootstrap cross-compilation recipe Nov 5, 2021
@openjdk
Copy link

openjdk bot commented Nov 5, 2021

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 Nov 5, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 5, 2021

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

openjdk bot commented Nov 5, 2021

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

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

8256182: Update qemu-debootstrap cross-compilation recipe

Reviewed-by: sgehwolf

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 the ready Pull request is ready to be integrated label Nov 5, 2021
@shipilev
Copy link
Member Author

shipilev commented Nov 8, 2021

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Nov 8, 2021

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

  • 3a35158: 8274338: com/sun/jdi/RedefineCrossEvent.java failed "assert(m != __null) failed: NULL mirror"
  • 1d2fee0: 8233637: [TESTBUG] Swing ActionListenerCalledTwiceTest.java fails on macos
  • 8dc5f14: 8233641: [TESTBUG] JMenuItem test bug4171437.java fails on macos
  • ca35b75: 8233560: [TESTBUG] ToolTipManager/Test6256140.java is failing on macos
  • 73cbc72: 8248500: AArch64: Remove the r18 dependency on Windows AArch64
  • 889840b: 8233570: [TESTBUG] HTMLEditorKit test bug5043626.java is failing on macos

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 8, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 8, 2021
@openjdk
Copy link

openjdk bot commented Nov 8, 2021

@shipilev Pushed as commit 299e6c8.

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

@shipilev shipilev deleted the JDK-8256182-update-qemu branch November 8, 2021 09:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants