Merge pull request #418 from 2m/fix/scala-setup-2m

Use latest scala setup action
2m · Mar 4, 2024 · b038fdd · b038fdd
2 parents 601c22d + f1726c8
commit b038fdd
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,15 +15,16 @@ jobs:
       fail-fast: false
     steps:
     - uses: actions/checkout@v4
-    - uses: coursier/cache-action@v6
-    - uses: laughedelic/coursier-setup@v1
+    - uses: actions/setup-java@v4
       with:
-        jvm: adopt:11
-        apps: sbtn
-    - run: sbtn -v scalafixAll --check
-    - run: sbtn -v scalafmtCheckAll
-    - run: sbtn -v scalafmtSbtCheck
-    - run: sbtn -v headerCheckAll
+        distribution: temurin
+        java-version: 17
+        cache: sbt
+
+    - run: sbt --client scalafixAll --check
+    - run: sbt --client scalafmtCheckAll
+    - run: sbt --client scalafmtSbtCheck
+    - run: sbt --client headerCheckAll
     - name: yaml-lint
       uses: ibiqlik/action-yamllint@v3
 
@@ -34,13 +35,13 @@ jobs:
       fail-fast: false
     steps:
     - uses: actions/checkout@v4
-    - uses: coursier/cache-action@v6
-    - uses: laughedelic/coursier-setup@v1
+    - uses: actions/setup-java@v4
       with:
-        jvm: adopt:11
-        apps: sbtn
+        distribution: temurin
+        java-version: 17
+        cache: sbt
     - run: git submodule update --init
-    - run: sbtn -v test
+    - run: sbt --client test
     - uses: GabrielBB/xvfb-action@v1.6
       with:
         run: sbt scripted
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,13 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: olafurpg/setup-scala@v14
+
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 17
+        cache: sbt
+
     - run: sbt ci-release
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}