-
Notifications
You must be signed in to change notification settings - Fork 241
8360816: [11u] Use default value for ProgramFiles(x86) in GHA #3056
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
Conversation
👋 Welcome back vieiro! A progress list of the required criteria for merging this PR into |
@vieiro This change now passes all automated pre-integration checks. After integration, the commit message for the final commit will be:
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 As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@jerboaa) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
Webrevs
|
The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork: git checkout fixes/JDK-8360816
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why don't we set the expected ProgramFiles(x86)
environment variable to value C:\\Program Files (x86)
in the GHA job? This would be a less invasive fix as the code in this PR changes product code.
I think we could also add a new entry to the I'll experiment with this and report back. |
a358297
to
14e3f88
Compare
@vieiro Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
14e3f88
to
0927ca7
Compare
@vieiro Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information. |
We cannot add a We can instead add it directly to the JTReg options using This is cleaner (no changes to product code) but it propagates the environment variable on Linux and MacOS. |
Right, but we can fix that too. See my suggested comment. |
Ah, that's clever. Will do that during the week! Thanks! |
Well, this should do it... |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems OK.
|
/approval request Please consider approving this PR as it makes it possible to pass the AOT compiler tests in GitHub Actions with the latest "windows-2025" runners. Little risk as only the |
/integrate |
/sponsor |
Going to push as commit 646b6b5. |
A fix for JDK-8360816.
The
ProgramFiles(x86)
environment variable is not properly propagated to JTReg tests in JDK11, which makes the AOT compiler tests fail on the newwindows-2025
GHA runners, as manifested in the backport of https://bugs.openjdk.org/browse/JDK-8358538.Propagating this environment variable to JTRegs may require creating devkits for Windows 2022, but previous attempts were discarded JDK-8283723.
This fix prints a warning message when this environment variable is not set, and then uses a default value (
C:\Program Files (x86)
) that makes it possible to run the AOT tests with these newwindows-2025
GHA runners. If theProgramFiles(x86)
env variable is set the fix has no effect, ensuring the previous behaviour. If the proposed default value is incorrect the AOT tests will continue to fail as before.The PR is on top of #3052 to verify the fix works as intended with the new
windows-2025
GHA runners.Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/3056/head:pull/3056
$ git checkout pull/3056
Update a local copy of the PR:
$ git checkout pull/3056
$ git pull https://git.openjdk.org/jdk11u-dev.git pull/3056/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 3056
View PR using the GUI difftool:
$ git pr show -t 3056
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3056.diff
Using Webrev
Link to Webrev Comment