From 192cc2c0e7520632738007b8acd66924dacb160c Mon Sep 17 00:00:00 2001
From: Roman Popat <roman.popat@proton.me>
Date: Sat, 20 Sep 2025 20:25:58 +0100
Subject: [PATCH 1/2] corrected quoting pattern on predeploy scripts

---
 bs3-functions/firebase.json | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/bs3-functions/firebase.json b/bs3-functions/firebase.json
index 4a03264..ae3ad12 100644
--- a/bs3-functions/firebase.json
+++ b/bs3-functions/firebase.json
@@ -5,11 +5,7 @@
   },
   "hosting": {
     "public": "build",
-    "ignore": [
-      "firebase.json",
-      "**/.*",
-      "**/node_modules/**"
-    ],
+    "ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
     "rewrites": [
       {
         "source": "**",
@@ -30,8 +26,8 @@
       ],
       "runtime": "nodejs22",
       "predeploy": [
-        "yarn --cwd "$RESOURCE_DIR" lint",
-        "yarn --cwd "$RESOURCE_DIR" build"
+        "yarn --cwd \"$RESOURCE_DIR\" lint",
+        "yarn --cwd \"$RESOURCE_DIR\" build"
       ]
     }
   ],

From 810d6dae79a107ae77a87d79a2709c574f45c03f Mon Sep 17 00:00:00 2001
From: Roman Popat <roman.popat@proton.me>
Date: Sat, 20 Sep 2025 20:47:03 +0100
Subject: [PATCH 2/2] use official gcloud action to auth

---
 .github/workflows/build-deploy-merge.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build-deploy-merge.yml b/.github/workflows/build-deploy-merge.yml
index 5167eca..dffd997 100644
--- a/.github/workflows/build-deploy-merge.yml
+++ b/.github/workflows/build-deploy-merge.yml
@@ -40,15 +40,16 @@ jobs:
       - name: Install Firebase CLI
         run: npm install -g firebase-tools
 
-      - name: Create service account file
-        run: echo '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BS3APP_DFB63 }}' > $HOME/gcloud.json
+      - name: Authenticate to Google Cloud
+        uses: google-github-actions/auth@v2
+        with:
+          credentials_json: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_BS3APP_DFB63 }}'
 
       - name: Deploy functions
         run: firebase deploy --only functions --project bs3app-dfb63
         working-directory: ./bs3-functions
         env:
           PERPLEXITY_SONAR_API_KEY: ${{ secrets.PERPLEXITY_SONAR_API_KEY }}
-          GOOGLE_APPLICATION_CREDENTIALS: $HOME/gcloud.json
       
       - name: Deploy to Firebase Hosting
         uses: FirebaseExtended/action-hosting-deploy@v0