From ea38b83e0a276855580296de3c2e52cdeb6e3d3a Mon Sep 17 00:00:00 2001
From: Andrea Diotallevi <andrea.diotallevi@guardian.co.uk>
Date: Wed, 8 Jan 2025 13:26:55 +0200
Subject: [PATCH 1/2] build: revert to ubuntu-latest

---
 .github/workflows/ci.yml                    | 2 +-
 .github/workflows/sbt-dependency-graph.yaml | 4 ++--
 .github/workflows/scala-steward.yml         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6abdb25..66ba9bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
       id-token: write
       contents: read
     name: salesforce-message-handler build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Env
         run: env
diff --git a/.github/workflows/sbt-dependency-graph.yaml b/.github/workflows/sbt-dependency-graph.yaml
index 219b176..b8c4648 100644
--- a/.github/workflows/sbt-dependency-graph.yaml
+++ b/.github/workflows/sbt-dependency-graph.yaml
@@ -3,10 +3,10 @@ on:
   push:
     branches:
       - main
-  workflow_dispatch: 
+  workflow_dispatch:
 jobs:
   dependency-graph:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout branch
         id: checkout
diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
index 63287b4..4343b64 100644
--- a/.github/workflows/scala-steward.yml
+++ b/.github/workflows/scala-steward.yml
@@ -10,7 +10,7 @@ jobs:
 
     if: github.actor == 'scala-steward'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo

From adc84387f4e8be55375dafa1275943cf739d6557 Mon Sep 17 00:00:00 2001
From: Andrea Diotallevi <andrea.diotallevi@guardian.co.uk>
Date: Wed, 8 Jan 2025 13:27:40 +0200
Subject: [PATCH 2/2] build: add setep for installing sbt

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 66ba9bf..7110acb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -34,6 +34,10 @@ jobs:
           java-version: "21"
           cache: "sbt"
 
+      - name: Install sbt
+        id: sbt
+        uses: sbt/setup-sbt@8a071aa780c993c7a204c785d04d3e8eb64ef272 # v1.1.0
+
       - name: Compile and package project
         run: sbt 'set test in assembly := {}' clean assembly