Switch to setup-java action

2m · Dec 2, 2023 · 775f924 · 775f924
1 parent 377eadb
commit 775f924
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,16 +14,17 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
-    - uses: coursier/cache-action@v6
-    - uses: laughedelic/coursier-setup@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
-        jvm: adopt:14
-        apps: sbtn
-    - run: sbtn scalafixAll --check
-    - run: sbtn scalafmtCheckAll
-    - run: sbtn scalafmtSbtCheck
-    - run: sbtn 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
 
@@ -33,11 +34,12 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-    - uses: actions/checkout@v3
-    - uses: coursier/cache-action@v6
-    - uses: laughedelic/coursier-setup@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
-        jvm: adopt:14
-        apps: sbtn
-    - run: sbtn +compile
-    - run: sbtn +test
+        distribution: temurin
+        java-version: 17
+        cache: sbt
+
+    - run: sbt --client +compile
+    - run: sbt --client +test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,10 +9,16 @@ jobs:
   publish:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-    - uses: olafurpg/setup-scala@v13
+
+    - uses: actions/setup-java@v4
+      with:
+        distribution: temurin
+        java-version: 17
+        cache: sbt
+
     - run: sbt ci-release
       env:
         PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}