From 7c4ec77205b7671c9c43fff9b6faabca60cb95f7 Mon Sep 17 00:00:00 2001
From: Andrew Nowak <andrew.nowak@guardian.co.uk>
Date: Thu, 20 Feb 2025 11:51:33 +0000
Subject: [PATCH] remaining changes for actions-raff-raff@4, and setup-scala

---
 .github/workflows/ci.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4ce6a38dad..8736487a7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ on:
       - main
 jobs:
   CI:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     permissions:
       # required by aws-actions/configure-aws-credentials
       id-token: write
@@ -56,11 +56,7 @@ jobs:
           sudo apt-get -y install graphicsmagick-imagemagick-compat
           sudo apt-get -y install exiftool
       - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: '11'
-          distribution: 'corretto'
-          cache: 'sbt'
+        uses: guardian/setup-scala@v1
       - name: SBT
         env:
           USE_DOCKER_FOR_TESTS: false # i.e. don't initialise the DockerContainer within tests, instead rely on the ones defined in the 'services' section of this file
@@ -77,15 +73,11 @@ jobs:
           npm install-clean
           npm test
           npm run build
-      - uses: aws-actions/configure-aws-credentials@v4
-        if: "! github.event.pull_request.head.repo.fork"
-        with:
-          role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
-          aws-region: eu-west-1
       - uses: guardian/actions-riff-raff@v4.1.7
         if: "! github.event.pull_request.head.repo.fork"
         with:
           githubToken: ${{ secrets.GITHUB_TOKEN }}
+          roleArn: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           commentingStage: TEST
           projectName: media-service::grid::all
           buildNumberOffset: 7565