From 4b3dae969666467187d528fb6ec81e0ab9ee876c Mon Sep 17 00:00:00 2001
From: Samuel Gerard <sggerard1997@gmail.com>
Date: Wed, 27 Nov 2024 15:47:05 -0800
Subject: [PATCH] chore: Fix deploy production workflow (#20)

---
 .github/workflows/deploy.prod.yml | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/deploy.prod.yml b/.github/workflows/deploy.prod.yml
index 0768d04..91af698 100644
--- a/.github/workflows/deploy.prod.yml
+++ b/.github/workflows/deploy.prod.yml
@@ -4,9 +4,10 @@ on:
   workflow_dispatch:
     inputs:
       pr_no:
-        description: "PR-numbered container set to deploy"
+        description: "PR or tag to deploy (default = 'test')"
         type: number
         required: false
+        default: "test"
 
 concurrency:
   # Do not interrupt previous workflows
@@ -14,25 +15,13 @@ concurrency:
   cancel-in-progress: false
 
 jobs:
-  vars:
-    name: Set Variables
-    outputs:
-      pr: ${{ steps.pr.outputs.pr }}
-    runs-on: ubuntu-24.04
-    timeout-minutes: 1
-    steps:
-      # Get PR number for squash merges to main
-      - name: PR Number
-        id: pr
-        uses: bcgov-nr/action-get-pr@v0.0.1
-  
   deploy-prod:
     name: Deploy (prod)
-    needs: [vars]
     uses: ./.github/workflows/.deployer.yml
     secrets: inherit
     with:
       environment: prod
+      tag: ${{ inputs.pr_no}}
       params:
         --set cms.deploymentStrategy=RollingUpdate
         --set frontend.deploymentStrategy=RollingUpdate
@@ -43,7 +32,7 @@ jobs:
         --set frontend.replicaCount=2
   promote:
     name: Promote Images
-    needs: [deploy-prod, vars]
+    needs: [deploy-prod]
     runs-on: ubuntu-24.04
     permissions:
       packages: write
@@ -56,5 +45,5 @@ jobs:
         with:
           registry: ghcr.io
           repository: ${{ github.repository }}/${{ matrix.package }}
-          target: ${{ needs.vars.outputs.pr }}
+          target: ${{ inputs.pr_no }}
           tags: prod