ci: merge test-windows in test job

gotson · Aug 21, 2024 · 6d91f85 · 6d91f85
1 parent 0d9e16b
commit 6d91f85
Showing 1 changed file with 5 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,12 +27,13 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-22.04, macos-12 ]
+        os: [ ubuntu-22.04, macos-12, windows-latest ]
       fail-fast: false
     name: Test ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Homebrew
+      - name: Set up Homebrew for Linux/Mac
+        if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
         id: set-up-homebrew
         uses: Homebrew/actions/setup-homebrew@master
       - name: Install libraries for Linux/Mac
@@ -41,31 +42,7 @@ jobs:
         env:
           HOMEBREW_NO_INSTALL_CLEANUP: 1
           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: '21'
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
-      - name: Gradle build
-        run: ./gradlew build
-        env:
-          LD_LIBRARY_PATH: /home/linuxbrew/.linuxbrew/lib
-          JAVA_LIBRARY_PATH: /usr/local/lib/
-      - name: Upload Unit Test Reports
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: test-reports-${{ matrix.os }}
-          path: '**/build/reports/tests/'
-
-  test-windows:
-    runs-on: windows-latest
-    name: Test windows
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup test-libraries in path
+      - name: Setup test-libraries in path for Windows
         run: Add-Content $env:GITHUB_PATH $env:GITHUB_WORKSPACE\test-libraries\windows\x64\
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -76,15 +53,14 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
       - name: Gradle build
         run: ./gradlew build
-        continue-on-error: true
         env:
           LD_LIBRARY_PATH: /home/linuxbrew/.linuxbrew/lib
           JAVA_LIBRARY_PATH: /usr/local/lib/
       - name: Upload Unit Test Reports
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: test-reports-windows
+          name: test-reports-${{ matrix.os }}
           path: '**/build/reports/tests/'
 
   version: