8358538: Update GHA Windows runner to 2025 #3052

shipilev · 2025-06-23T17:39:52Z

Fixes GHA. Current Windows runners are already in brown-out stage, and will be decommissioned by the end of the month. So we need to get it into update repos soon.

Additional testing:

GHA

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue
JDK-8358538 needs maintainer approval
JDK-8360042 needs maintainer approval

Issues

JDK-8358538: Update GHA Windows runner to 2025 (Bug - P4 - Approved)
JDK-8360042: GHA: Bump MSVC to 14.44 (Bug - P3 - Approved)

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/3052/head:pull/3052
$ git checkout pull/3052

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3052

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/3052.diff

Using Webrev

Link to Webrev Comment

shipilev · 2025-06-23T17:40:02Z

/issue add JDK-8360042

bridgekeeper · 2025-06-23T17:40:06Z

👋 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 · 2025-06-23T17:40:16Z

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

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

8358538: Update GHA Windows runner to 2025
8360042: GHA: Bump MSVC to 14.44

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 · 2025-06-23T17:40:35Z

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

openjdk · 2025-06-23T17:41:05Z

@shipilev
Adding additional issue to issue list: 8360042: GHA: Bump MSVC to 14.44.

mlbridge · 2025-06-23T17:44:13Z

Webrevs

01: Full (3fc3ede4)
00: Full (a72f1538)

jerboaa · 2025-06-24T08:10:49Z

Windows build fails with:


* For target support_native_jdk.jdwp.agent_libjdwp_debugInit.obj:
debugInit.c
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(249): error C2220: the following warning is treated as an error
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(249): warning C5287: operands are different enum types '<unnamed-enum-JVMTI_VERSION_1>' and '<unnamed-enum-JVMTI_VERSION_MASK_INTERFACE_TYPE>'; use an explicit cast to silence this warning
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(249): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(251): warning C5287: operands are different enum types '<unnamed-enum-JVMTI_VERSION_1>' and '<unnamed-enum-JVMTI_VERSION_MASK_INTERFACE_TYPE>'; use an explicit cast to silence this warning
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(251): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(253): warning C5287: operands are different enum types '<unnamed-enum-JVMTI_VERSION_1>' and '<unnamed-enum-JVMTI_VERSION_MASK_INTERFACE_TYPE>'; use an explicit cast to silence this warning
d:\a\jdk11u-dev\jdk11u-dev\src\jdk.jdwp.agent\share\native\libjdwp\debugInit.c(253): note: to simplify migration, consider the temporary use of /Wv:18 flag with the version of the compiler with which you used to build without warnings

Some more work needs to happen it seems for 11u.

jerboaa · 2025-06-24T08:11:21Z

Pre-submit tests - linux-x86 / build - Build / test is infra related.

vieiro · 2025-06-24T08:23:29Z

@jerboaa @shipilev Yep. It seems https://bugs.openjdk.org/browse/JDK-8357193 should be backported to 11 too.

jerboaa · 2025-06-24T08:37:04Z

@jerboaa @shipilev Yep. It seems https://bugs.openjdk.org/browse/JDK-8357193 should be backported to 11 too.

@vieiro Thanks. Please create a PR for the backport. It seems a small enough change and would get this unblocked.

shipilev · 2025-06-24T08:39:53Z

Right, thanks. I'll wait for JDK-8357193 to get in first.

shipilev · 2025-06-24T09:40:23Z

Right, thanks. I'll wait for JDK-8357193 to get in first.

I see there is already the PR: #3034

vieiro · 2025-06-24T09:42:41Z

Right, thanks. I'll wait for JDK-8357193 to get in first.

I see there is already the PR: #3034

D'oh! I'll close #3053 then

shipilev · 2025-06-25T17:17:43Z

Pulled in new master that contains #3034 now. Let's see if it fixes the rest of the build.

openjdk · 2025-06-25T17:18:03Z

@shipilev 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.

jerboaa · 2025-06-26T08:07:48Z

Tier1 compiler failures on Windows seem related. Failures look like:

----------System.err:(26/1550)----------
artifact resolution error: jdk.test.lib.artifacts.ArtifactResolverException: Couldn't automatically resolve dependency for devkit-windows_x64 , revision VS2017-15.5.5+1.0
Please specify the location using jdk.test.lib.artifacts.devkit-windows_x64
 stdout: [Compiling libDeoptimizationTest.so...
Exception in thread "main" java.lang.InternalError: Can't locate Microsoft Visual Studio amd64 link.exe
	at [email protected]/jdk.tools.jaotc.Linker.<init>(Linker.java:112)
	at [email protected]/jdk.tools.jaotc.Main.run(Main.java:160)
	at [email protected]/jdk.tools.jaotc.Main.run(Main.java:133)
	at [email protected]/jdk.tools.jaotc.Main.main(Main.java:89)
];
 stderr: []
 exitValue = 1

vieiro · 2025-06-26T08:31:39Z

@shipilev @jerboaa ,

This happens because the ProgramFiles(x86) environment variable is not set properly with windows-2025 (nor with windows-2022 AFAIK), and the linker cannot be found.

It seems JDK-8248987 doesn't work as intented.

If ProgramFiles(x86) environment variable is not set we could use a default directory and print out a warning. Something similar to:

diff --git a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java
index 92c80aad397..6af0c17512d 100644
--- a/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java
+++ b/src/jdk.aot/share/classes/jdk.tools.jaotc/src/jdk/tools/jaotc/Linker.java
@@ -163,7 +163,7 @@ final class Linker {
      */
     private static String getWindowsLinkPath(Main main) throws Exception {
         try {
-            Path vc141NewerLinker = getVC141AndNewerLinker();
+            Path vc141NewerLinker = getVC141AndNewerLinker(main);
             if (vc141NewerLinker != null) {
                 return vc141NewerLinker.toString();
             }
@@ -204,10 +204,11 @@ final class Linker {
         return null;
     }
 
-    private static Path getVC141AndNewerLinker() throws Exception {
+    private static Path getVC141AndNewerLinker(Main main) throws Exception {
         String programFilesX86 = System.getenv("ProgramFiles(x86)");
         if (programFilesX86 == null) {
-            throw new IllegalStateException("Could not read the ProgramFiles(x86) environment variable");
+            programFilesX86 = "C:\\Program Files (x86)";
+            main.printer.printlnInfo("Could not read the ProgramFiles(x86) environment variable. Using default '" + programFilesX86 + "'");
         }
         String vswherePath = programFilesX86 + "\\Microsoft Visual Studio\\Installer\\vswhere.exe";
         Path vswhere = Paths.get(vswherePath);

Let me know if you want me to create a new issue with that patch on top of this PR.

vieiro · 2025-06-26T08:38:55Z

Or, who knows, maybe we need a new createWindowsDevkit2022.sh similar to createWindowsDevkit2019.sh ...

shipilev · 2025-06-27T08:57:24Z

Let me know if you want me to create a new issue with that patch on top of this PR.

Yes, please, if you can figure this out in a separate issue?

I think at this point, with runners going away soon, we are better off pushing this backport, even with jaotc test failures. Because the alternative is to not having Windows testing at all past June 30. Let's see if there is a resolution before that cut-out date.

vieiro · 2025-06-27T09:37:24Z

I've created https://bugs.openjdk.org/browse/JDK-8360816. Feel free to enhance as you see fit. A PR within the hour.

vieiro · 2025-06-27T10:17:21Z

Well, let's see what happens.
I've set it on top of this PR (to verify the fix works) but we may want to set it on top of master and have it merged first.

vieiro · 2025-06-27T11:19:46Z

Yep, looks like the fix in #3056 brings back the passing AOT compiler tests...

shipilev · 2025-06-27T11:21:26Z

OK. Looks like @vieiro's test fix works. I say we integrate this PR, followed by @vieiro's fix.

/approval 8358538 request Same reason as for 21u. Requires JDK-8360042 as the followups, and JDK-8360816 as another test fix. JDK-8360042 would follow in the same commit. JDK-8360816 would be done as the subsequent PR.
/approval 8360042 request Same reason as for 21u. Follow-up for JDK-8358538.

openjdk · 2025-06-27T11:21:59Z

@shipilev
8358538: The approval request has been created successfully.

openjdk · 2025-06-27T11:22:09Z

@shipilev
8360042: The approval request has been created successfully.

jerboaa · 2025-06-27T11:54:11Z

/approve yes

jerboaa

Looks good. Test failures are going to be fixed with #3056

openjdk · 2025-06-27T11:55:47Z

@jerboaa
8358538: The approval request has been approved.
8360042: The approval request has been approved.

shipilev · 2025-06-27T12:00:03Z

Let's go!

/integrate

openjdk · 2025-06-27T12:01:27Z

Going to push as commit 0927ca7.

openjdk · 2025-06-27T12:01:34Z

@shipilev Pushed as commit 0927ca7.

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

openjdk bot changed the title ~~Backport b787ff6def08a050b690b60e4a0ceb3aec2b73c8~~ 8358538: Update GHA Windows runner to 2025 Jun 23, 2025

openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jun 23, 2025

vieiro mentioned this pull request Jun 23, 2025

8358538: Update GHA Windows runner to 2025 #3050

Closed

4 tasks

shipilev mentioned this pull request Jun 24, 2025

8357193: [VS 2022 17.14] Warning C5287 in debugInit.c: enum type mismatch during build #3034

Closed

4 tasks

shipilev added 2 commits June 25, 2025 19:17

Backport b787ff6def08a050b690b60e4a0ceb3aec2b73c8

85ac5f0

Backport 72679c94ee00c87b9b51233938e5ffa97ef825b1

3fc3ede

shipilev force-pushed the JDK-8358538-gha-windows2025 branch from a72f153 to 3fc3ede Compare June 25, 2025 17:17

vieiro mentioned this pull request Jun 27, 2025

8360816: [11u] Use default value for ProgramFiles(x86) in GHA #3056

Closed

4 tasks

openjdk bot added the approval Requires approval; will be removed when approval is received label Jun 27, 2025

jerboaa approved these changes Jun 27, 2025

View reviewed changes

openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 27, 2025

openjdk bot added the integrated Pull request has been integrated label Jun 27, 2025

openjdk bot closed this Jun 27, 2025

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 27, 2025

8358538: Update GHA Windows runner to 2025 #3052

8358538: Update GHA Windows runner to 2025 #3052

Uh oh!

Conversation

shipilev commented Jun 23, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issues

Reviewers

Reviewing

Uh oh!

shipilev commented Jun 23, 2025

Uh oh!

bridgekeeper bot commented Jun 23, 2025

Uh oh!

openjdk bot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jun 23, 2025

Uh oh!

openjdk bot commented Jun 23, 2025

Uh oh!

mlbridge bot commented Jun 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

jerboaa commented Jun 24, 2025

Uh oh!

jerboaa commented Jun 24, 2025

Uh oh!

vieiro commented Jun 24, 2025

Uh oh!

jerboaa commented Jun 24, 2025

Uh oh!

shipilev commented Jun 24, 2025

Uh oh!

shipilev commented Jun 24, 2025

Uh oh!

vieiro commented Jun 24, 2025

Uh oh!

shipilev commented Jun 25, 2025

Uh oh!

openjdk bot commented Jun 25, 2025

Uh oh!

jerboaa commented Jun 26, 2025

Uh oh!

vieiro commented Jun 26, 2025

Uh oh!

vieiro commented Jun 26, 2025

Uh oh!

shipilev commented Jun 27, 2025

Uh oh!

vieiro commented Jun 27, 2025

Uh oh!

vieiro commented Jun 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vieiro commented Jun 27, 2025

Uh oh!

shipilev commented Jun 27, 2025

Uh oh!

openjdk bot commented Jun 27, 2025

Uh oh!

openjdk bot commented Jun 27, 2025

Uh oh!

jerboaa commented Jun 27, 2025

Uh oh!

jerboaa left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jun 27, 2025

Uh oh!

shipilev commented Jun 27, 2025

Uh oh!

openjdk bot commented Jun 27, 2025

Uh oh!

openjdk bot commented Jun 27, 2025

Uh oh!

Uh oh!

shipilev commented Jun 23, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jun 23, 2025 •

edited

Loading

mlbridge bot commented Jun 23, 2025 •

edited

Loading

vieiro commented Jun 27, 2025 •

edited

Loading