Fix matrix

zio · Jun 30, 2024 · 3d05c64 · 3d05c64
1 parent 30b28a5
commit 3d05c64
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,11 +79,7 @@ jobs:
         java:
         - '11'
         - '21'
-        scala-project-java11:
-        - ++2.12 zioCacheJVM
-        - ++2.13 zioCacheJVM
-        - ++3.3 zioCacheJVM
-        scala-project-java21:
+        scala-project:
         - ++2.12 zioCacheJVM
         - ++2.13 zioCacheJVM
         - ++3.3 zioCacheJVM
@@ -108,15 +104,8 @@ jobs:
       uses: actions/checkout@v4
       with:
         fetch-depth: '0'
-    - name: Java 11 Tests
-      if: ${{ matrix.java == '11' }}
-      run: free --si -tmws 10 & sbt ${{ matrix.scala-project-java11 }}/test
-    - name: Java 17 Tests
-      if: ${{ matrix.java == '17' }}
-      run: free --si -tmws 10 & sbt ${{ matrix.scala-project-java17 }}/test
-    - name: Java 21 Tests
-      if: ${{ matrix.java == '21' }}
-      run: free --si -tmws 10 & sbt ${{ matrix.scala-project-java21 }}/test
+    - name: Test
+      run: free --si -tmws 10 & sbt ${{ matrix.scala-project }}/test
   update-readme:
     name: Update README
     runs-on: ubuntu-latest

diff --git a/build.sbt b/build.sbt
@@ -24,10 +24,6 @@ inThisBuild(
       )
     ),
     ciEnabledBranches := Seq("series/2.x"),
-    ciTargetMinJavaVersions := Map(
-      (zioCacheJS / thisProject).value.id     -> "21",
-      (zioCacheNative / thisProject).value.id -> "21"
-    ),
     ciTargetJavaVersions := List("11", "21"),
     ciTargetScalaVersions := Map(
       (zioCacheJVM / thisProject).value.id    -> allScalas,