Use common GHA for deploy

Author: fileformat

.github/workflows/gcr-deploy.yaml

@@ -1,59 +1,64 @@
-name: Build and deploy to Google Cloud Run
+name: deploy
 
 on:
   push:
     branches:
-    - master
+    - main
+
+  workflow_dispatch:
 
 # Environment variables available to all jobs and steps in this workflow
+# NOTE: these aren't really secret, but there aren't non-secret settings
 env:
-  PROJECT_ID: ${{ secrets.RUN_PROJECT }}
+  RUN_PROJECT: ${{ secrets.RUN_PROJECT }}
   RUN_REGION: ${{ secrets.RUN_REGION }}
-  SERVICE_NAME: ${{ secrets.RUN_SERVICE }}
+  RUN_SERVICE: ${{ secrets.RUN_SERVICE }}
 
 jobs:
-  setup-build-deploy:
-    name: Setup, Build, and Deploy
+  deploy:
+    name: Deploy to CloudRun
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
-      # Setup gcloud CLI
-      - uses: GoogleCloudPlatform/github-actions/setup-gcloud@master
+      - name: gcloud auth
+        id: 'auth'
+        uses: 'google-github-actions/auth@v2'
         with:
-          version: '275.0.0'
-          service_account_email: ${{ secrets. GCP_SA_EMAIL }}
-          service_account_key: ${{ secrets. GCP_SA_KEY }}
+          credentials_json: '${{ secrets.GCP_SA_KEY }}'
 
-      # Configure gcloud CLI
-      - name: gcloud Set up
-        run: |
-          gcloud config set project $PROJECT_ID
+      # Setup gcloud CLI
+      - name: gcloud setup
+        uses: google-github-actions/setup-gcloud@v2
+
+      - name: gcloud docker-auth
+        run: gcloud auth configure-docker
 
       # Build and push image to Google Container Registry
       - name: Build
         run: |
           docker build \
             --build-arg COMMIT=${GITHUB_SHA:0:7} \
             --build-arg LASTMOD=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
-            --tag gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA .
+            --tag gcr.io/${RUN_PROJECT}/${RUN_SERVICE}:$GITHUB_SHA \
+            .
 
       - name: GCloud auth to docker
         run: |
           gcloud auth configure-docker
 
       - name: Push to registry
         run: |
-          docker push gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA
+          docker push gcr.io/${RUN_PROJECT}/${RUN_SERVICE}:$GITHUB_SHA
 
       # Deploy image to Cloud Run
       - name: Deploy
         run: |
-          gcloud run deploy $SERVICE_NAME \
+          gcloud run deploy ${RUN_SERVICE} \
             --allow-unauthenticated \
-            --image gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA \
+            --image gcr.io/${RUN_PROJECT}/${RUN_SERVICE}:$GITHUB_SHA \
             --platform managed \
-            --project ${PROJECT_ID} \
-            --region $RUN_REGION
+            --project ${RUN_PROJECT} \
+            --region ${RUN_REGION}