Merge branch 'master' of github.com:eisbuk/EisBuk into enhancement/mo…

…bile-ui
eisbuk · Dec 12, 2024 · e846df3 · e846df3
2 parents 3d3fe57 + a6cbf4f
commit e846df3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 12 deletions.
diff --git a/.github/workflow.templates/deploy-production.yml b/.github/workflow.templates/deploy-production.yml
@@ -9,6 +9,7 @@ name: Deploy to production
   push:
     branches:
       - master
+      - test/production-deployment
 
 jobs:
   deploy:
@@ -54,7 +55,7 @@ jobs:
           environment: production
           sourcemaps: "./packages/client/dist/assets"
           version: ${{ env.SENTRY_RELEASE }}
-      - name: Create Sentry release for client app
+      - name: Create Sentry release for firebase functions
         uses: getsentry/action-release@v1
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -67,11 +68,9 @@ jobs:
           version: ${{ env.SENTRY_RELEASE }}
       - name: Write service account key
         run: |
-          cat > $HOME/key.json <<EOF
+          cat > /tmp/key.json <<EOF
           ${{ secrets.GCP_KEY_JSON }}
           EOF
-      - name: Set creds env var
-        run: echo "GOOGLE_APPLICATION_CREDENTIALS=$HOME/key.json" >> $GITHUB_ENV
       - name: Deploy to firebase
         run: |
           echo FUNCTIONS_SENTRY_DSN="$FUNCTIONS_SENTRY_DSN" > packages/functions/.env
@@ -80,6 +79,7 @@ jobs:
         env:
           FUNCTIONS_SENTRY_DSN: ${{ secrets.FUNCTIONS_SENTRY_DSN }}
           REACT_APP_SENTRY_RELEASE: ${{ env.SENTRY_RELEASE }}
+          GOOGLE_APPLICATION_CREDENTIALS: /tmp/key.json
       - name: debug
         if: steps.has_secret.outputs.HAS_SECRETS && (success() || failure())
         run: ls -l ; ls firebase-debug.log && cat firebase-debug.log || true
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -3,6 +3,7 @@ name: Deploy to production
   push:
     branches:
     - master
+    - test/production-deployment
 jobs:
   deploy:
     environment: Production
@@ -62,7 +63,7 @@ jobs:
         environment: production
         sourcemaps: ./packages/client/dist/assets
         version: ${{ env.SENTRY_RELEASE }}
-    - name: Create Sentry release for client app
+    - name: Create Sentry release for firebase functions
       uses: getsentry/action-release@v1
       env:
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
@@ -75,11 +76,9 @@ jobs:
         version: ${{ env.SENTRY_RELEASE }}
     - name: Write service account key
       run: |
-        cat > $HOME/key.json <<EOF
+        cat > /tmp/key.json <<EOF
         ${{ secrets.GCP_KEY_JSON }}
         EOF
-    - name: Set creds env var
-      run: echo "GOOGLE_APPLICATION_CREDENTIALS=$HOME/key.json" >> $GITHUB_ENV
     - name: Deploy to firebase
       run: |
         echo FUNCTIONS_SENTRY_DSN="$FUNCTIONS_SENTRY_DSN" > packages/functions/.env
@@ -88,6 +87,7 @@ jobs:
       env:
         FUNCTIONS_SENTRY_DSN: ${{ secrets.FUNCTIONS_SENTRY_DSN }}
         REACT_APP_SENTRY_RELEASE: ${{ env.SENTRY_RELEASE }}
+        GOOGLE_APPLICATION_CREDENTIALS: /tmp/key.json
     - name: debug
       if: steps.has_secret.outputs.HAS_SECRETS && (success() || failure())
       run: ls -l ; ls firebase-debug.log && cat firebase-debug.log || true
diff --git a/deploy-firebase.expect b/deploy-firebase.expect
@@ -12,14 +12,23 @@ set timeout 240
 
 
 cd packages/client/
-spawn npx firebase deploy --project eisbuk
+spawn npx firebase deploy --project eisbuk --debug
+
+
 
 expect {
     "*Would you like to proceed with deletion?*" {
-        # Some unexpected cloud functions are present. Tell firebase CLI not to delete them
         send -- "N\r"
+        exp_continue
+    }
+    "*Deploy complete!*" {
+        exp_continue
+    }
+    eof {
+        # Deployment finished or failed
     }
-    "*Deploy complete!*"
 }
 
-expect eof
+# Capture the exit code of the spawned process and exit with the same code
+set waitval [wait]
+exit [lindex $waitval 3]