Merge pull request #133 from guardian/ld/add-setup-scala

Use setup scala
guardian · Nov 5, 2024 · a6680d2 · a6680d2
2 parents 43b87af + 5cdb3c5
commit a6680d2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml
@@ -13,12 +13,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 21
-          distribution: corretto
-          cache: sbt
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Run Tests & Create Artifacts
         run: sbt "project mobile-save-for-later-user-deletion" test assembly
@@ -32,4 +28,4 @@ jobs:
             mobile-save-for-later-user-deletion-cfn:
              - ./mobile-save-for-later-user-deletion/conf/cfn.yaml
             mobile-save-for-later-user-deletion:
-             - mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar
+             - mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar
diff --git a/.github/workflows/ci-mobile-save-for-later.yaml b/.github/workflows/ci-mobile-save-for-later.yaml
@@ -13,12 +13,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: corretto
-          cache: sbt
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Run Tests and Create Artifacts
         run: sbt "project mobile-save-for-later" test assembly

diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+java corretto-21