From 29b224823aa72dc5a1f2c0e2ba9e114da110ab46 Mon Sep 17 00:00:00 2001
From: paolofacchinetti <paolo.facchinetti.ipad@gmail.com>
Date: Tue, 12 Mar 2024 10:09:36 +0100
Subject: [PATCH 1/2] fix(ci): use correct aws region for both pipelines

---
 .github/workflows/continuum.yaml |  4 +++-
 .github/workflows/release.yaml   | 14 ++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
index aed9cdc23e..80140e1d02 100644
--- a/.github/workflows/continuum.yaml
+++ b/.github/workflows/continuum.yaml
@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - develop
+      - feat/ci
 
 env:
   VERSION: 10.0.0-SNAPSHOT
+  AWS_REGION: eu-south-1
 
 jobs:
   ketchup-release:
@@ -41,7 +43,7 @@ jobs:
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-1
+        aws-region: ${{ env.AWS_REGION }}
 
     - name: Upload artifacts to AWS S3
       run: |
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 00c52a2084..a8ed2b63e5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -4,6 +4,9 @@ on:
   push:
     tags: "*"
 
+env:
+  AWS_REGION: eu-south-1
+
 jobs:
   ketchup-release:
     runs-on: ubuntu-latest
@@ -32,11 +35,14 @@ jobs:
         zip -qr ketchup-components.zip packages/ketchup/dist/ketchup
         ls -alh ketchup-components.zip
 
+    - name: Setup AWS
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ env.AWS_REGION }}
+
     - name: Upload artifacts to AWS S3
       run: |
         aws s3 cp ketchup.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ github.ref_name }}/zip/ketchup.zip
         aws s3 cp ketchup-components.zip s3://smeup-ketchup/npm-pub/ketchup-stencil/${{ github.ref_name }}/zip/ketchup-components.zip
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_DEFAULT_REGION: eu-south-1

From c28c080efd301c7e2bc87bcb52a45c9d2a773e17 Mon Sep 17 00:00:00 2001
From: paolofacchinetti <paolo.facchinetti.ipad@gmail.com>
Date: Tue, 12 Mar 2024 10:25:14 +0100
Subject: [PATCH 2/2] fix(ci): webup dispatch trigger has mandatory event type

---
 .github/workflows/continuum.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuum.yaml b/.github/workflows/continuum.yaml
index 80140e1d02..02f11c1509 100644
--- a/.github/workflows/continuum.yaml
+++ b/.github/workflows/continuum.yaml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - develop
-      - feat/ci
 
 env:
   VERSION: 10.0.0-SNAPSHOT
@@ -86,6 +85,7 @@ jobs:
           -H "Accept: application/vnd.github+json" \
           -H "Authorization: Bearer ${{ secrets.ROBBY_SMEUP_PAT }}" \
           -H "X-GitHub-Api-Version: 2022-11-28" \
-          https://api.github.com/repos/smeup/webup-project/dispatches
+          https://api.github.com/repos/smeup/webup-project/dispatches \
+          -d '{"event_type": "ketchup-continuum-rebuild"}'
   
   # TODO: add webup.js triggers
\ No newline at end of file