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

8276854: Windows GHA builds fail due to broken Cygwin #609

Closed
wants to merge 1 commit into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Nov 10, 2021

Unclean backport to unbreak Windows GHA runs. The uncleanliness comes from the fact Windows AArch64 had not been integrated in 11u yet, so the related config is not present in workflow.

Additional testing:

  • Windows GHA runs are fine (see "Checks" tab)

Progress

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

Issue

  • JDK-8276854: Windows GHA builds fail due to broken Cygwin

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 609

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 10, 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 403f3185f0988dcf6ef4e857d6659533bfa2943f 8276854: Windows GHA builds fail due to broken Cygwin Nov 10, 2021
@openjdk
Copy link

openjdk bot commented Nov 10, 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 10, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 10, 2021

Webrevs

Copy link
Contributor

@theRealAph theRealAph left a comment

Choose a reason for hiding this comment

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

Thanks. We're getting closer with AArch64 Windows, shouldn't be too long now.

@openjdk
Copy link

openjdk bot commented Nov 10, 2021

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

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

8276854: Windows GHA builds fail due to broken Cygwin

Reviewed-by: aph, clanger

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

  • c406da1: 8276943: Backout JDK-8274338 11u backport
  • a15fa7a: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah

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.

➡️ 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 10, 2021
@shipilev
Copy link
Member Author

Got the push approval.

/integrate

@openjdk
Copy link

openjdk bot commented Nov 11, 2021

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

  • 1d62284: 8198617: java/awt/Focus/6382144/EndlessLoopTest.java fails on mac
  • 2876be0: 8136517: [macosx]Test java/awt/Focus/8073453/AWTFocusTransitionTest.java fails on MacOSX
  • c406da1: 8276943: Backout JDK-8274338 11u backport
  • a15fa7a: 8274522: java/lang/management/ManagementFactory/MXBeanException.java test fails with Shenandoah

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 11, 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 11, 2021
@openjdk
Copy link

openjdk bot commented Nov 11, 2021

@shipilev Pushed as commit c6242ed.

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

@shipilev shipilev deleted the JDK-8276854-windows-cygwin branch December 21, 2021 09:03
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
3 participants