Merge branch 'master' into codeowners-group

target · Jun 15, 2023 · fd1a4ff · fd1a4ff
2 parents 3d6239b + 5c8cfa4
commit fd1a4ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 32 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,23 +17,11 @@ jobs:
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
-
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v14
+      - uses: coursier/cache-action@v6
         with:
-          java-version: [email protected]
-
-      - name: Cache sbt
-        uses: actions/cache@v3
+          extraKey: ${{ runner.os }}
+      - uses: coursier/setup-action@v1
         with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
+          jvm: adopt:1.8
       - name: Build, test, and package project
         run: bin/sbt clean compile test package makePom
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -16,24 +16,12 @@ jobs:
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v3
-
-      - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v14
+      - uses: coursier/cache-action@v6
         with:
-          java-version: [email protected]
-
-      - name: Cache sbt
-        uses: actions/cache@v3
+          extraKey: ${{ runner.os }}
+      - uses: coursier/setup-action@v1
         with:
-          path: |
-            ~/.sbt
-            ~/.ivy2/cache
-            ~/.coursier/cache/v1
-            ~/.cache/coursier/v1
-            ~/AppData/Local/Coursier/Cache/v1
-            ~/Library/Caches/Coursier/v1
-          key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
-
+          jvm: adopt:1.8
       # uses sbt-github-packages, see build.sbt
       - name: Publish with SBT
         run: bin/sbt publish