fix build matrix

zio · Oct 6, 2024 · f6b944c · f6b944c
1 parent 686d53d
commit f6b944c
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -46,18 +46,15 @@ jobs:
           java-version: ${{ matrix.java }}
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
-      - name: Run JS tests
-        if: ${{ matrix.platform == 'JS' && !startsWith(matrix.scala, '3.') }}
-        run: sbt ++${{ matrix.scala }}! testJS
-      - name: Run 2.12 JVM tests
-        if: ${{ matrix.platform == 'JVM' && startsWith(matrix.scala, '2.12') }}
-        run: sbt ++${{ matrix.scala }}! testJVM212
-      - name: Run 2.13 JVM tests
-        if: ${{ matrix.platform == 'JVM' && startsWith(matrix.scala, '2.13') }}
-        run: sbt ++${{ matrix.scala }}! testJVM213
-      - name: Run 3.x JVM tests
-        if: ${{ matrix.platform == 'JVM' && startsWith(matrix.scala, '3.') }}
-        run: sbt ++${{ matrix.scala }}! testJVM3x
+      - name: Run ${{ matrix.scala }} ${{ matrix.platform }} tests
+        run: |
+          SCALA_SUFFIX=""
+          if [[ ${{ matrix.scala }} == 2.12* ]]; then
+            SCALA_SUFFIX="2_12"
+          elif [[ ${{ matrix.scala }} == 3.* ]]; then
+            SCALA_SUFFIX="3"
+          fi
+          sbt test${{ matrix.platform }}${SCALA_SUFFIX}
 
   ci:
     runs-on: ubuntu-22.04