Skip to content

Commit

Permalink
Add -release flag and run JS/native tests only for JDK21
Browse files Browse the repository at this point in the history
  • Loading branch information
kyri-petrou committed Jun 30, 2024
1 parent 07672de commit 30b28a5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 4 deletions.
17 changes: 14 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,11 @@ jobs:
java:
- '11'
- '21'
scala-project:
scala-project-java11:
- ++2.12 zioCacheJVM
- ++2.13 zioCacheJVM
- ++3.3 zioCacheJVM
scala-project-java21:
- ++2.12 zioCacheJVM
- ++2.13 zioCacheJVM
- ++3.3 zioCacheJVM
Expand All @@ -104,8 +108,15 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: '0'
- name: Test
run: free --si -tmws 10 & sbt ${{ matrix.scala-project }}/test
- 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
update-readme:
name: Update README
runs-on: ubuntu-latest
Expand Down
10 changes: 9 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ inThisBuild(
url("http://degoes.net")
)
),
ciEnabledBranches := Seq("series/2.x"),
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,
Expand Down Expand Up @@ -61,6 +65,10 @@ lazy val zioCache = crossProject(JSPlatform, JVMPlatform, NativePlatform)
libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-collection-compat" % ScalaCollectionCompatVersion
),
scalacOptions ++= Seq(
"-release",
"11"
),
scalacOptions ++=
(if (scalaBinaryVersion.value == "3")
Seq()
Expand Down

0 comments on commit 30b28a5

Please sign in to comment.