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

8274840: Update OS detection code to recognize Windows 11 #188

Closed
wants to merge 1 commit into from
Closed

8274840: Update OS detection code to recognize Windows 11 #188

wants to merge 1 commit into from

Conversation

@hseigel
Copy link
Member

@hseigel hseigel commented Oct 14, 2021

Backport of JDK-8274840 to JDK-17u. Patch applied cleanly and was tested with Mach5 tiers 1-5 on Windows.
Harold


Progress

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

Issue

  • JDK-8274840: Update OS detection code to recognize Windows 11

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u pull/188/head:pull/188
$ git checkout pull/188

Update a local copy of the PR:
$ git checkout pull/188
$ git pull https://git.openjdk.java.net/jdk17u pull/188/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 188

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u/pull/188.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Oct 14, 2021

👋 Welcome back hseigel! 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 97ea9dd2f24f9f1fb9b9345a4202a825ee28e014 8274840: Update OS detection code to recognize Windows 11 Oct 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

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

8274840: Update OS detection code to recognize Windows 11

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

  • bbcb072: 8274407: (tz) Update Timezone Data to 2021c
  • 47c129d: 8269656: The test test/langtools/tools/javac/versions/Versions.java has duplicate test cycles
  • cbd82db: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing

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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Oct 14, 2021

Webrevs

@hseigel
Copy link
Member Author

@hseigel hseigel commented Oct 14, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

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

  • bbcb072: 8274407: (tz) Update Timezone Data to 2021c
  • 47c129d: 8269656: The test test/langtools/tools/javac/versions/Versions.java has duplicate test cycles
  • cbd82db: 8137101: [TEST_BUG] javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java failure due to timing

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 14, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 14, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 14, 2021

@hseigel Pushed as commit e79cb9c.

💡 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
1 participant