From 866392ce9cc54a65b35da63df942f508f47ee316 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:10:43 +0200
Subject: [PATCH 01/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index e615576d..900dcec0 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -2,6 +2,8 @@ name: CD Workflow
 on:
   release:
     types: [published,created]
+  pull_request:
+    branches: [master]
 jobs:
   build:
     runs-on: ubuntu-latest

From 1fb596951c1c33a926a6b1cc1f3e68d0c551c04a Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:16:41 +0200
Subject: [PATCH 02/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index 900dcec0..b705b65c 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -29,7 +29,7 @@ jobs:
           EOF
 
       - name: Build appbundle
-        run: flutter build appbundle --no-shrink
+        run: cd fivekmrun_app_flutter && flutter build appbundle --no-shrink
 
       - name: Sign App Bundle
         run: |
@@ -41,5 +41,5 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: bg.fivekmpark.fivekmrun
-          releaseFiles: build/app/outputs/flutter-apk/app-release.apk
+          releaseFiles: fivekmrun_app_flutter/build/app/outputs/flutter-apk/app-release.apk
           track: production

From 07cdd236a66d67bb56bef2bcff7f13c278de05e3 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:28:34 +0200
Subject: [PATCH 03/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index b705b65c..7588a062 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Sign App Bundle
         run: |
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > /tmp/keystore.jks
-          jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore /tmp/keystore.jks -storepass ${{ secrets.KEYSTORE_PASSWORD }} -keypass ${{ secrets.KEYSTORE_PASSWORD }} build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
+          jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore /tmp/keystore.jks -storepass ${{ secrets.KEYSTORE_PASSWORD }} -keypass ${{ secrets.KEYSTORE_PASSWORD }} fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
 
       - name: Upload to Google Play
         uses: r0adkll/upload-google-play@v1

From c3489ac5f2a03ae4cb62426dccfa2772c098fa5b Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:41:54 +0200
Subject: [PATCH 04/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index 7588a062..bbe74af8 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -34,8 +34,7 @@ jobs:
       - name: Sign App Bundle
         run: |
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > /tmp/keystore.jks
-          jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore /tmp/keystore.jks -storepass ${{ secrets.KEYSTORE_PASSWORD }} -keypass ${{ secrets.KEYSTORE_PASSWORD }} fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
-
+          jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore /tmp/keystore.jks -storepass ${{ secrets.KEYSTORE_PASSWORD }} -keypass ${{ secrets.KEYSTORE_PASSWORD }} ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
       - name: Upload to Google Play
         uses: r0adkll/upload-google-play@v1
         with:

From 67721e6ce65f10827d708249a0cd8420089210cb Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:46:21 +0200
Subject: [PATCH 05/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index bbe74af8..51f5b239 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Sign App Bundle
         run: |
           echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 --decode > /tmp/keystore.jks
-          jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore /tmp/keystore.jks -storepass ${{ secrets.KEYSTORE_PASSWORD }} -keypass ${{ secrets.KEYSTORE_PASSWORD }} ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
+          jarsigner -verbose -sigalg SHA256withRSA -digestalg SHA-256 -keystore /tmp/keystore.jks -storepass '${{ secrets.KEYSTORE_PASSWORD }}' -keypass '${{ secrets.KEYSTORE_PASSWORD }}' ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab ${{ secrets.KEYSTORE_ALIAS }}
       - name: Upload to Google Play
         uses: r0adkll/upload-google-play@v1
         with:

From 01bda0c2f61cee70e2d8b72916a51cfc9ebe8435 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Thu, 9 Nov 2023 23:53:56 +0200
Subject: [PATCH 06/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index 51f5b239..42dab53e 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -40,5 +40,5 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: bg.fivekmpark.fivekmrun
-          releaseFiles: fivekmrun_app_flutter/build/app/outputs/flutter-apk/app-release.apk
+          releaseFiles: ./fivekmrun_app_flutter/build/app/outputs/flutter-apk/app-release.apk
           track: production

From f1e3c1a8110827355726af8fb33255cb0310fc7a Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 00:02:39 +0200
Subject: [PATCH 07/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index 42dab53e..bead2083 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -40,5 +40,5 @@ jobs:
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: bg.fivekmpark.fivekmrun
-          releaseFiles: ./fivekmrun_app_flutter/build/app/outputs/flutter-apk/app-release.apk
+          releaseFiles: ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab
           track: production

From e1c0e7d4f7fa38297a0f2325cc9ae7092a7e7db3 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 00:51:20 +0200
Subject: [PATCH 08/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index bead2083..ee14cd45 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -1,4 +1,4 @@
-name: CD Workflow
+name: CD Workflow 
 on:
   release:
     types: [published,created]

From 99796057e77df7cc61323db310b9de6661b675e2 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 00:56:45 +0200
Subject: [PATCH 09/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index ee14cd45..cfe78cca 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -41,4 +41,5 @@ jobs:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: bg.fivekmpark.fivekmrun
           releaseFiles: ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab
-          track: production
+          track: alpha
+          status: completed

From 8ae57204674cdb158c0ce18b65025737ce984f20 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 08:50:09 +0200
Subject: [PATCH 10/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index cfe78cca..2bef493b 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -23,9 +23,9 @@ jobs:
           GOOGLE_MAPS_KEY: ${{ secrets.GOOGLE_MAPS_KEY }}
         run: |
           mkdir ./fivekmrun_app_flutter/lib/private && cat << EOF > ./fivekmrun_app_flutter/lib/private/secrets.dart
-          const stravaSecret = "$STRAVA_SECRET";
-          const stravaClientId = "$STRAVA_CLIENT_ID";
-          const googleMapsKey = "$GOOGLE_MAPS_KEY"; 
+          const stravaSecret = $STRAVA_SECRET;
+          const stravaClientId = $STRAVA_CLIENT_ID;
+          const googleMapsKey = $GOOGLE_MAPS_KEY; 
           EOF
 
       - name: Build appbundle
@@ -41,5 +41,5 @@ jobs:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: bg.fivekmpark.fivekmrun
           releaseFiles: ./fivekmrun_app_flutter/build/app/outputs/bundle/release/app-release.aab
-          track: alpha
-          status: completed
+          track: production
+          status: draft

From d11b23cf8fffe2ac32ca7419911122b6924028e5 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 08:55:24 +0200
Subject: [PATCH 11/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index 2bef493b..b0532e03 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -23,9 +23,9 @@ jobs:
           GOOGLE_MAPS_KEY: ${{ secrets.GOOGLE_MAPS_KEY }}
         run: |
           mkdir ./fivekmrun_app_flutter/lib/private && cat << EOF > ./fivekmrun_app_flutter/lib/private/secrets.dart
-          const stravaSecret = $STRAVA_SECRET;
-          const stravaClientId = $STRAVA_CLIENT_ID;
-          const googleMapsKey = $GOOGLE_MAPS_KEY; 
+          const stravaSecret = '${{ STRAVA_SECRET }}';
+          const stravaClientId = '${{ STRAVA_CLIENT_ID }}';
+          const googleMapsKey = '${{ GOOGLE_MAPS_KEY }}'; 
           EOF
 
       - name: Build appbundle

From d88d64fb533b8eaac29fa4abd68c7e8ff7c2f394 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 08:56:48 +0200
Subject: [PATCH 12/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index b0532e03..d58bdb2d 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -1,4 +1,4 @@
-name: CD Workflow 
+name: CD Workflow
 on:
   release:
     types: [published,created]

From 806e6dc5e4ca5b29c022db771112f28d36340626 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Fri, 10 Nov 2023 08:57:59 +0200
Subject: [PATCH 13/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index d58bdb2d..bedd75b6 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -23,9 +23,9 @@ jobs:
           GOOGLE_MAPS_KEY: ${{ secrets.GOOGLE_MAPS_KEY }}
         run: |
           mkdir ./fivekmrun_app_flutter/lib/private && cat << EOF > ./fivekmrun_app_flutter/lib/private/secrets.dart
-          const stravaSecret = '${{ STRAVA_SECRET }}';
-          const stravaClientId = '${{ STRAVA_CLIENT_ID }}';
-          const googleMapsKey = '${{ GOOGLE_MAPS_KEY }}'; 
+          const stravaSecret = '$STRAVA_SECRET';
+          const stravaClientId = '$STRAVA_CLIENT_ID';
+          const googleMapsKey = '$GOOGLE_MAPS_KEY'; 
           EOF
 
       - name: Build appbundle

From ae9aa39134d6beb2e95e046d17935968e8e2c1e2 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Sun, 12 Nov 2023 17:29:03 +0200
Subject: [PATCH 14/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index bedd75b6..f0e32104 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -28,6 +28,9 @@ jobs:
           const googleMapsKey = '$GOOGLE_MAPS_KEY'; 
           EOF
 
+      - name: Replace Firebase config
+        run: rm ./fivekmrun_app_flutter/android/app/google-services.json && echo "${{ secrets.FIREBASE_CONFIG }}" | base64 --decode > ./fivekmrun_app_flutter/android/app/google-services.json
+        
       - name: Build appbundle
         run: cd fivekmrun_app_flutter && flutter build appbundle --no-shrink
 

From 85fd29d3f77ab1b5d27b0c80391d9087f29b6f78 Mon Sep 17 00:00:00 2001
From: Emil Tabakov <emil.tabakov@gmail.com>
Date: Sun, 12 Nov 2023 18:00:00 +0200
Subject: [PATCH 15/15] Update continuous-deployment-build.yml

---
 .github/workflows/continuous-deployment-build.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/continuous-deployment-build.yml b/.github/workflows/continuous-deployment-build.yml
index f0e32104..60540e3a 100644
--- a/.github/workflows/continuous-deployment-build.yml
+++ b/.github/workflows/continuous-deployment-build.yml
@@ -1,11 +1,8 @@
-name: CD Workflow
+name: Continous Delivery Workflow
 on:
-  release:
-    types: [published,created]
-  pull_request:
-    branches: [master]
+  workflow_dispatch
 jobs:
-  build:
+  android-build:
     runs-on: ubuntu-latest
     environment: production
     steps: