From 9e5d5473a9e640adfa60abab9afd455fb2ceee46 Mon Sep 17 00:00:00 2001
From: David Lawes <david.lawes@guardian.co.uk>
Date: Thu, 24 Aug 2023 09:16:07 +0100
Subject: [PATCH] move jar to root for every assembly workflow

---
 .github/workflows/fake-breaking-news.yml | 5 ++++-
 .github/workflows/football.yml           | 5 ++++-
 .github/workflows/report-extractor.yml   | 5 ++++-
 .github/workflows/schedule-lambda.yml    | 5 ++++-
 .github/workflows/slo-monitor.yml        | 5 ++++-
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/fake-breaking-news.yml b/.github/workflows/fake-breaking-news.yml
index d9deab282..89cac2f85 100644
--- a/.github/workflows/fake-breaking-news.yml
+++ b/.github/workflows/fake-breaking-news.yml
@@ -41,6 +41,9 @@ jobs:
       - name: Compile, test and assembly
         run: sbt "project fakebreakingnewslambda" "compile" "test" "assembly"
 
+      - name: Copy jar to root
+        run: cp fakebreakingnewslambda/target/scala-*/fakebreakingnewslambda.jar .
+
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v2
         with:
@@ -48,6 +51,6 @@ jobs:
           configPath: fakebreakingnewslambda/riff-raff.yaml
           contentDirectories: |
             fakebreakingnewslambda:
-              - fakebreakingnewslambda/target/scala-2.13/fakebreakingnewslambda.jar
+              - fakebreakingnewslambda.jar
             fakebreakingnewslambda-cfn:
               - fakebreakingnewslambda/fakebreakingnewslambda-cfn.yaml
diff --git a/.github/workflows/football.yml b/.github/workflows/football.yml
index 8bc70a44d..e514c5f5e 100644
--- a/.github/workflows/football.yml
+++ b/.github/workflows/football.yml
@@ -39,6 +39,9 @@ jobs:
       - name: Compile, test and assembly
         run: sbt "project football" "compile" "test" "assembly"
 
+      - name: Copy jar to root
+        run: cp football/target/scala-*/football.jar .
+
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v2
         with:
@@ -46,6 +49,6 @@ jobs:
           configPath: football/riff-raff.yaml
           contentDirectories: |
             football:
-              - football/target/scala-2.13/football.jar
+              - football.jar
             mobile-notifications-football-cfn:
               - football/cfn.yaml
diff --git a/.github/workflows/report-extractor.yml b/.github/workflows/report-extractor.yml
index 8773fa054..46a120629 100644
--- a/.github/workflows/report-extractor.yml
+++ b/.github/workflows/report-extractor.yml
@@ -40,6 +40,9 @@ jobs:
       - name: Compile, test and assembly
         run: sbt "project reportextractor" "compile" "test" "assembly"
 
+      - name: Copy jar to root
+        run: cp reportextractor/target/scala-*/reportextractor.jar .
+
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v2
         with:
@@ -47,6 +50,6 @@ jobs:
           configPath: reportextractor/riff-raff.yaml
           contentDirectories: |
             reportextractor:
-              - reportextractor/target/scala-2.13/reportextractor.jar
+              - reportextractor.jar
             reportextractor-cfn:
               - reportextractor/cfn.yaml
diff --git a/.github/workflows/schedule-lambda.yml b/.github/workflows/schedule-lambda.yml
index 145d5e976..cb11263cf 100644
--- a/.github/workflows/schedule-lambda.yml
+++ b/.github/workflows/schedule-lambda.yml
@@ -39,6 +39,9 @@ jobs:
       - name: Compile, test and assembly
         run: sbt "project schedule" "compile" "test" "assembly"
 
+      - name: Copy jar to root
+        run: cp schedulelambda/target/scala-*/schedule.jar .
+
       - name: Upload to riff-raff
         uses: guardian/actions-riff-raff@v2
         with:
@@ -46,6 +49,6 @@ jobs:
           configPath: schedulelambda/riff-raff.yaml
           contentDirectories: |
             schedule:
-              - schedulelambda/target/scala-2.13/schedule.jar
+              - schedule.jar
             schedule-cfn:
               - schedulelambda/cfn.yaml
diff --git a/.github/workflows/slo-monitor.yml b/.github/workflows/slo-monitor.yml
index 2470e41bc..10d7935c5 100644
--- a/.github/workflows/slo-monitor.yml
+++ b/.github/workflows/slo-monitor.yml
@@ -46,6 +46,9 @@ jobs:
       - name: Compile, test and assembly
         run: sbt "project slomonitor" "compile" "test" "assembly"
 
+      - name: Copy jar to root
+        run: cp slomonitor/target/scala-*/slomonitor.jar .
+
       - name: CDK synth
         run: |
           cd cdk
@@ -61,7 +64,7 @@ jobs:
           configPath: slomonitor/riff-raff.yaml
           contentDirectories: |
             slomonitor:
-              - slomonitor/target/scala-2.13/slomonitor.jar
+              - slomonitor.jar
             mobile-notifications-slo-monitor-cfn:
               - cdk/cdk.out/SloMonitor-CODE.template.json
               - cdk/cdk.out/SloMonitor-PROD.template.json