feat: CE-906 merge main updates

.github/workflows/merge-hotfix.yml

@@ -0,0 +1,68 @@
+# Deploys hotfixes to the test environment
+name: Merge-Hotfix
+
+on:
+  push:
+    branches: [hotfix]
+    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-hotfix:
+    name: Deploy (hotfix)
+    needs: vars
+    uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
+    secrets:
+      oc_namespace: ${{ secrets.OC_NAMESPACE }}
+      oc_token: ${{ secrets.OC_TOKEN }}
+    with:
+      environment: hotfix
+      tag: ${{ needs.vars.outputs.pr }}
+
+  promote:
+    name: Promote Images
+    needs: [deploy-hotfix, 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: hotfix

.github/workflows/merge-main.yml

@@ -28,21 +28,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/[email protected]
+        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-prod:
     name: Deploy (prod)
-    needs: [deploy-test, vars]
+    needs: [vars]
     uses: bcgov/quickstart-openshift-helpers/.github/workflows/[email protected]
     secrets:
       oc_namespace: ${{ secrets.OC_NAMESPACE }}
       oc_token: ${{ secrets.OC_TOKEN }}
     with:
       environment: prod
+      tag: ${{ needs.vars.outputs.pr }}
       params: --set backend.deploymentStrategy=RollingUpdate
         --set frontend.deploymentStrategy=RollingUpdate
         --set global.autoscaling=true