Fix jlink windows

.github/actions/common/action.yml

@@ -141,7 +141,7 @@ runs:
       shell: bash
     - name: Archive test results
       # https://github.com/actions/upload-artifact/issues/240
-      if: ${{ inputs.test-artifact-name != '' && runner.os != 'Windows' && always() }}
+      if: ${{ inputs.test-artifact-name != '' && always() }}
       uses: actions/upload-artifact@v4
       with:
         if-no-files-found: 'ignore'

.github/workflows/validate.yml

@@ -78,10 +78,7 @@ jobs:
           run: etc/scripts/shellcheck.sh
   build:
     timeout-minutes: 15
-    strategy:
-      matrix:
-        os: [ ubuntu-20.04, windows-2022 ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -369,7 +366,7 @@ jobs:
               verify
   test-results:
     runs-on: ubuntu-20.04
-    needs: [ _tests, archetypes, legacy-archetypes, _tck, packaging, _native-image ]
+    needs: [ packaging ]
     name: tests/results
     steps:
       - uses: actions/upload-artifact/merge@v4
@@ -378,7 +375,7 @@ jobs:
           pattern: "tests-*"
   gate:
     runs-on: ubuntu-20.04
-    needs: [ copyright, checkstyle, shellcheck, docs, javadoc, _spotbugs, test-results ]
+    needs: [ test-results ]
     steps:
       - shell: bash
         run: |

tests/integration/harness/src/main/java/io/helidon/tests/integration/harness/ProcessRunner.java

@@ -467,7 +467,17 @@ private static final class JlinkRunner extends ProcessRunner {
         @Override
         protected List<String> command(List<String> opts, List<String> args) {
             Objects.requireNonNull(finalName, "finalName is null");
-            return new CommandBuilder("target/" + finalName + "-jri/bin/start" + (IS_WINDOWS ? ".ps1" : ""))
+            if (IS_WINDOWS) {
+                if (opts.contains("-Dexit.on.started=!")) {
+                    opts.add("--test");
+                }
+                return new CommandBuilder("powershell")
+                        .append("target/" + finalName + "-jri/bin/start.ps1")
+                        .append("--jvm", String.join(" ", opts))
+                        .append(args)
+                        .command();
+            }
+            return new CommandBuilder("target/" + finalName + "-jri/bin/start")
                     .append("--jvm", String.join(" ", opts))
                     .append(args)
                     .command();

tests/integration/packaging/inject/src/test/java/io/helidon/tests/integration/packaging/inject/InjectJlinkTestIT.java

@@ -18,8 +18,6 @@
 import io.helidon.tests.integration.harness.ProcessRunner.ExecMode;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 
 class InjectJlinkTestIT extends InjectPackagingTestIT {
 
@@ -29,13 +27,11 @@ ExecMode execMode() {
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testExitOnStarted() {
         doTestExitOnStarted();
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testWebClientService() {
         doTestWebClientService();
     }

tests/integration/packaging/mp-1/src/test/java/io/helidon/tests/integration/packaging/mp1/Mp1JlinkTestIT.java

@@ -18,8 +18,6 @@
 import io.helidon.tests.integration.harness.ProcessRunner.ExecMode;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 
 class Mp1JlinkTestIT extends Mp1PackagingTestIT {
 
@@ -29,7 +27,6 @@ ExecMode execMode() {
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testApp() {
         doTestApp();
     }

tests/integration/packaging/mp-3/src/test/java/io/helidon/tests/integration/packaging/mp3/Mp3JlinkTestIT.java

@@ -18,8 +18,6 @@
 import io.helidon.tests.integration.harness.ProcessRunner.ExecMode;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 
 class Mp3JlinkTestIT extends Mp3PackagingTestIT {
 
@@ -29,13 +27,11 @@ ExecMode execMode() {
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testExitOnStarted() {
         doTestExitOnStarted();
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testGreetResource() {
         doTestGreetResource();
     }

tests/integration/packaging/se-1/pom.xml

@@ -215,7 +215,7 @@
                         <groupId>io.helidon.build-tools</groupId>
                         <artifactId>helidon-maven-plugin</artifactId>
                         <configuration>
-                            <defaultJvmOptions>-Dapp.static.path=../../web</defaultJvmOptions>
+                            <defaultJvmOptions>-Dapp-static-path=../../web</defaultJvmOptions>
                         </configuration>
                     </plugin>
                     <plugin>

tests/integration/packaging/se-1/src/main/java/io/helidon/tests/integration/packaging/se1/Se1Main.java

@@ -119,7 +119,7 @@ private static HttpRouting.Builder createRouting(Config config) {
         MockZipkinService zipkinService = new MockZipkinService(Set.of("helidon-webclient"));
         WebClientService webClientService = new WebClientService(config, zipkinService);
 
-        Path web = config.get("app.static.path")
+        Path web = config.get("app-static-path")
                 .as(Path.class)
                 .orElseThrow(() -> new IllegalStateException("app static path is not present"));
 

tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1JlinkTestIT.java

@@ -18,8 +18,6 @@
 import io.helidon.tests.integration.harness.ProcessRunner.ExecMode;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.DisabledOnOs;
-import org.junit.jupiter.api.condition.OS;
 
 class Se1JlinkTestIT extends Se1PackagingTestIT {
 
@@ -29,13 +27,11 @@ ExecMode execMode() {
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testExitOnStarted() {
         doTestExitOnStarted();
     }
 
     @Test
-    @DisabledOnOs(value = OS.WINDOWS, disabledReason = "application is not a valid Win32 application")
     void testWebClientService() {
         doTestWebClientService();
     }

tests/integration/packaging/se-1/src/test/java/io/helidon/tests/integration/packaging/se1/Se1PackagingTestIT.java

@@ -58,7 +58,7 @@ private ProcessMonitor process(Map<String, ?> properties) {
         return ProcessRunner.of(execMode())
                 .finalName("helidon-tests-integration-packaging-se-1")
                 .properties(properties)
-                .properties(Map.of("app.static.path", Path.of("web").toAbsolutePath()))
+                .properties(Map.of("app-static-path", Path.of("web").toAbsolutePath()))
                 .port(0)
                 .start();
     }