Update google-cloudrun-docker.yml

Author: Lukecsharpwalker

.github/workflows/google-cloudrun-docker.yml

@@ -3,60 +3,77 @@ name: Deploy Angular Blog to Cloud Run
 on:
   push:
     branches:
-      - main 
+      - main
 
 jobs:
   test:
-    name: Run Unit Tests
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '18'
-      - name: Generate environment.ts from secrets
-        shell: bash
+
+      - name: Generate Angular environment files
         run: |
-          cat > src/environments/environment.ts <<'EOF'
+          cat <<EOF > src/environments/environment.ts
+          export const environment = {
+            production: false,
+            supabaseUrl: '${SUPABASE_URL}',
+            supabaseKey: '${SUPABASE_ANON_KEY}',
+          };
+          EOF
+          cat <<EOF > src/environments/environment.prod.ts
           export const environment = {
             production: true,
-            supabaseUrl: '${{ secrets.SUPABASE_URL }}',
-            supabaseKey: '${{ secrets.SUPABASE_ANON_KEY }}',
+            supabaseUrl: '${SUPABASE_URL}',
+            supabaseKey: '${SUPABASE_ANON_KEY}',
           };
           EOF
+        env:
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
 
-      - name: Install dependencies
-        run: npm ci
+      - run: npm ci
 
-      - name: Run unit tests with headless Chrome
-        run: npm run test -- --browsers=ChromeHeadless --watch=false --no-progress
-        continue-on-error: false
+      - run: npm run test -- --browsers=ChromeHeadless --watch=false --no-progress
 
   deploy:
-    name: Build and Deploy
     runs-on: ubuntu-latest
     needs: test
-    
     steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3
 
-      - name: Set up Node.js
-        uses: actions/setup-node@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: '18'
 
-      - name: Install dependencies
-        run: npm ci
+      - name: Generate Angular environment files
+        run: |
+          cat <<EOF > src/environments/environment.ts
+          export const environment = {
+            production: false,
+            supabaseUrl: '${SUPABASE_URL}',
+            supabaseKey: '${SUPABASE_ANON_KEY}',
+          };
+          EOF
+          cat <<EOF > src/environments/environment.prod.ts
+          export const environment = {
+            production: true,
+            supabaseUrl: '${SUPABASE_URL}',
+            supabaseKey: '${SUPABASE_ANON_KEY}',
+          };
+          EOF
+        env:
+          SUPABASE_URL: ${{ secrets.SUPABASE_URL }}
+          SUPABASE_ANON_KEY: ${{ secrets.SUPABASE_ANON_KEY }}
+
+      - run: npm ci
 
-      - name: Build Angular app
-        run: npm run build --prod
+      - run: npm run build --prod
 
-      - name: Authenticate to Google Cloud
-        uses: google-github-actions/auth@v2
+      - uses: google-github-actions/auth@v2
         with:
           credentials_json: '${{ secrets.GCP_SA_KEY }}'
 
@@ -71,6 +88,6 @@ jobs:
       - name: Deploy to Cloud Run using Buildpacks
         uses: google-github-actions/deploy-cloudrun@v2
         with:
-          service: angular-blog 
+          service: angular-blog
           region: europe-west4
           source: .