Skip to content

Commit

Permalink
8306281: function isWsl() returns false on WSL2
Browse files Browse the repository at this point in the history
Reviewed-by: erikj
  • Loading branch information
Domest0s authored and erikj79 committed Jun 13, 2023
1 parent c884862 commit 9b0baa1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion make/conf/jib-profiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1519,7 +1519,7 @@ var getVersionNumbers = function () {
var isWsl = function (input) {
return ( input.build_osenv == "wsl"
|| (input.build_os == "linux"
&& java.lang.System.getProperty("os.version").contains("Microsoft")));
&& java.lang.System.getProperty("os.version").toLowerCase().contains("microsoft")));
}

var error = function (s) {
Expand Down

3 comments on commit 9b0baa1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

@TheRealMDoerr
Copy link
Contributor

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 9b0baa1 Jun 22, 2023

Choose a reason for hiding this comment

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

@TheRealMDoerr the backport was successfully created on the branch TheRealMDoerr-backport-9b0baa10 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9b0baa10 from the openjdk/jdk repository.

The commit being backported was authored by Ivan Bereziuk on 13 Jun 2023 and was reviewed by Erik Joelsson.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git TheRealMDoerr-backport-9b0baa10:TheRealMDoerr-backport-9b0baa10
$ git checkout TheRealMDoerr-backport-9b0baa10
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git TheRealMDoerr-backport-9b0baa10

Please sign in to comment.