From edbdd6900818b57dcfe747a069f0b7ff2941989c Mon Sep 17 00:00:00 2001
From: Barrett Falk <bfalk@salussystems.com>
Date: Thu, 18 Jul 2024 22:32:17 -0700
Subject: [PATCH] fix: applying PR fix to hotfix action (#545)

---
 .github/workflows/analysis.yml     | 2 +-
 .github/workflows/merge-hotfix.yml | 9 +++++++--
 .github/workflows/pr-close.yml     | 2 +-
 webeoc/src/main.ts                 | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index b87cafff0..3c634a375 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -46,7 +46,7 @@ jobs:
             npm ci
             npm run test:cov
           dir: ${{ matrix.dir }}
-          node_version: "22"
+          node_version: "20"
           sonar_args: >
             -Dsonar.exclusions=**/coverage/**,**/node_modules/**,**/*spec.ts
             -Dsonar.organization=bcgov-sonarcloud
diff --git a/.github/workflows/merge-hotfix.yml b/.github/workflows/merge-hotfix.yml
index 5a532bc35..ba2b65893 100644
--- a/.github/workflows/merge-hotfix.yml
+++ b/.github/workflows/merge-hotfix.yml
@@ -29,20 +29,25 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 1
     steps:
-      # Get PR number for squash merges to main
+      - uses: actions/checkout@v4
+      # Get PR number for squash merges to release
       - name: PR Number
         id: pr
-        uses: bcgov-nr/action-get-pr@v0.0.1
+        uses: ./.github/actions/get-pr-number
+      - name: Set PR Output
+        run: echo "pr=${{ steps.pr.outputs.pr }}" >> $GITHUB_OUTPUT
 
   # https://github.com/bcgov/quickstart-openshift-helpers
   deploy-hotfix:
     name: Deploy (hotfix)
+    needs: vars
     uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.5.0
     secrets:
       oc_namespace: ${{ secrets.OC_NAMESPACE }}
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
       environment: hotfix
+      tag: ${{ needs.vars.outputs.pr }}
 
   promote:
     name: Promote Images
diff --git a/.github/workflows/pr-close.yml b/.github/workflows/pr-close.yml
index ebd159daf..3337a8ea6 100644
--- a/.github/workflows/pr-close.yml
+++ b/.github/workflows/pr-close.yml
@@ -18,4 +18,4 @@ jobs:
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
       cleanup: helm
-      packages: backend frontend migrations
+      packages: backend frontend migrations webeoc
diff --git a/webeoc/src/main.ts b/webeoc/src/main.ts
index 680faf612..4f0b960fc 100644
--- a/webeoc/src/main.ts
+++ b/webeoc/src/main.ts
@@ -6,7 +6,7 @@ import { ExpressAdapter } from "@nestjs/platform-express";
 
 async function bootstrap() {
   process.env.TZ = "UTC"; // this application runs on UTC time in OpenShift, so let's do the same locally as well.  Useful to test polling periods.
-  console.log("Starting WebEOC Connection Container");
+  console.log("Starting WebEOC Container");
   dotenv.config();
   const server = express();
   server.disable("x-powered-by");