Split workflows for build and test

and use batch file on Windows ...
aim42 · Feb 5, 2024 · db22d7b · db22d7b
1 parent f84b91d
commit db22d7b
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 32 deletions.
diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
@@ -2,7 +2,7 @@ name: Gradle Build and Test
 on:
   pull_request:
   push:
-  workflow_dispatch: {}
+  workflow_dispatch:
 jobs:
   gradle:
     runs-on: ubuntu-latest
@@ -43,34 +43,7 @@ jobs:
           name: maven-repo
           path: build/maven-repo
 
-  test-java-os-mix:
-    needs: gradle
-    strategy:
-      matrix:
-        os-version: [ ubuntu-latest, macos-14, windows-latest ]
-        java-version: [ 11, 17, 21 ]
-    runs-on: ${{ matrix.os-version }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Download Artifacts
-        uses: actions/download-artifact@master
-        with:
-          name: maven-repo
-          path: build/maven-repo
-      - uses: actions/setup-java@v3
+      - name: Trigger Test Matrix Workflow
+        uses: benc-uk/workflow-dispatch@v1
         with:
-          distribution: temurin
-          # Always build with JDK 8 initially
-          java-version: ${{ matrix.java-version }}
-      - name: Execute integration test (on Unixes)
-        if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
-        run: |
-          uname -a
-          ./gradlew --version
-          ./gradlew integrationTestOnly --scan
-      - name: Execute integration test (on Windows)
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          uname -a
-          ./gradlew --version
-          ./gradlew integrationTestOnly --scan
+          workflow: test-java-os-mix
diff --git a/.github/workflows/test-java-os-mix.yml b/.github/workflows/test-java-os-mix.yml
@@ -0,0 +1,37 @@
+name: HTML Sanity Check Matrix Test
+on:
+  push:
+  workflow_dispatch: {}
+
+jobs:
+  test-java-os-mix:
+    strategy:
+      matrix:
+        os-version: [ ubuntu-latest, macos-14, windows-latest ]
+        java-version: [ 8, 11, 17, 21 ]
+    runs-on: ${{ matrix.os-version }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Download Artifacts
+        uses: actions/download-artifact@master
+        with:
+          name: maven-repo
+          path: build/maven-repo
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          # Always build with JDK 8 initially
+          java-version: ${{ matrix.java-version }}
+      - name: Execute integration test (on Unixes)
+#        if: ${{ runner.os == 'Linux' || runner.os == 'macOS' }}
+        run: |
+          uname -a
+          ./gradlew --version
+          ./gradlew integrationTestOnly --scan
+#      - name: Execute integration test (on Windows)
+#        if: ${{ runner.os == 'Windows' }}
+#        run: |
+#          uname -a
+#          gradlew --version
+#          gradlew integrationTestOnly --scan
+
diff --git a/build.gradle b/build.gradle
@@ -100,7 +100,7 @@ tasks.register("integrationTestOnly") {
     doLast {
         def result = exec {
             workingDir INTEGRATION_TEST_DIRECTORY
-            commandLine "./gradlew", "clean", "htmlSanityCheck", "-PhtmlSanityCheckVersion=${project.version}"
+            commandLine System.getProperty("os.name") == "Windows" ? "gradlew.bat" : "./gradlew", "clean", "htmlSanityCheck", "-PhtmlSanityCheckVersion=${project.version}"
         }
         logger.debug "Script output: $result"
         File integrationTestDirectory = file(INTEGRATION_TEST_DIRECTORY)