Merge pull request #335 from guardian/sbt-dependency-graph-459ff79c46…

…2695ea build: revert to ubuntu-latest and add step to install sbt
guardian · Jan 8, 2025 · 6cd16ec · 6cd16ec
2 parents ef76214 + 46c1551
commit 6cd16ec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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
 

diff --git 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
@@ -10,7 +10,7 @@ jobs:
 
     if: github.actor == 'scala-steward'
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo