From 0e6a2f414d6ca757a70bf9aad4e346a591b11977 Mon Sep 17 00:00:00 2001
From: Barrett Falk <bfalk@salussystems.com>
Date: Thu, 18 Jul 2024 23:00:04 -0700
Subject: [PATCH] fix: Fix pr number in hotfix round2 (#547)

---
 .github/workflows/merge-release.yml | 67 +++++++++++++++++++++++++++++
 webeoc/src/main.ts                  |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/merge-release.yml

diff --git a/.github/workflows/merge-release.yml b/.github/workflows/merge-release.yml
new file mode 100644
index 000000000..5b0d6a734
--- /dev/null
+++ b/.github/workflows/merge-release.yml
@@ -0,0 +1,67 @@
+name: Merge to Release
+
+on:
+  push:
+    branches: [release/*]
+    paths-ignore:
+      - "*.md"
+      - ".github/**"
+      - ".github/graphics/**"
+      - "!.github/workflows/**"
+  workflow_dispatch:
+    inputs:
+      pr_no:
+        description: "PR-numbered container set to deploy"
+        type: number
+        required: true
+
+concurrency:
+  # Do not interrupt previous workflows
+  group: ${{ github.workflow }}
+  cancel-in-progress: false
+
+jobs:
+  vars:
+    name: Set Variables
+    outputs:
+      pr: ${{ steps.pr.outputs.pr }}
+    runs-on: ubuntu-22.04
+    timeout-minutes: 1
+    steps:
+      - uses: actions/checkout@v4
+      # Get PR number for squash merges to release
+      - name: PR Number
+        id: pr
+        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-test:
+    name: Deploy (test)
+    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: test
+      tag: ${{ needs.vars.outputs.pr }}
+
+  promote:
+    name: Promote Images
+    needs: [deploy-test, vars]
+    runs-on: ubuntu-22.04
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        package: [migrations, backend, frontend, webeoc]
+    timeout-minutes: 1
+    steps:
+      - uses: shrink/actions-docker-registry-tag@v4
+        with:
+          registry: ghcr.io
+          repository: ${{ github.repository }}/${{ matrix.package }}
+          target: ${{ needs.vars.outputs.pr }}
+          tags: test
diff --git a/webeoc/src/main.ts b/webeoc/src/main.ts
index 4f0b960fc..03d31e7f2 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 Container");
+  console.log("Starting WebEOC Container...");
   dotenv.config();
   const server = express();
   server.disable("x-powered-by");