Merge branch 'main' into dependabot/npm_and_yarn/notificationworkerla…

…mbda/cdk/aws-cdk-2.162.1
guardian · Oct 16, 2024 · 1d5214c · 1d5214c
2 parents 993fe95 + 8f1516b
commit 1d5214c
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 50 deletions.
diff --git a/.github/workflows/event-consumer.yml b/.github/workflows/event-consumer.yml
@@ -26,11 +26,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/fake-breaking-news.yml b/.github/workflows/fake-breaking-news.yml
@@ -28,11 +28,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/football.yml b/.github/workflows/football.yml
@@ -27,11 +27,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/notification-worker-lambdas.yml b/.github/workflows/notification-worker-lambdas.yml
@@ -29,11 +29,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/notification.yml b/.github/workflows/notification.yml
@@ -29,11 +29,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/registration.yml b/.github/workflows/registration.yml
@@ -30,11 +30,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/report-extractor.yml b/.github/workflows/report-extractor.yml
@@ -27,11 +27,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/report.yml b/.github/workflows/report.yml
@@ -29,11 +29,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/schedule-lambda.yml b/.github/workflows/schedule-lambda.yml
@@ -27,11 +27,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: aws-actions/configure-aws-credentials@v2
         with:

diff --git a/.github/workflows/slo-monitor.yml b/.github/workflows/slo-monitor.yml
@@ -28,11 +28,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-java@v3
-        with:
-          distribution: corretto
-          cache: sbt
-          java-version: 11
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - uses: actions/setup-node@v3
         with: