fix: missing prod label for cronjob (among others?)

.github/workflows/merge-main.yml

@@ -19,7 +19,7 @@ concurrency:
 
 jobs:
   codeql:
-    name: Semantic Code Analysis
+    name: CodeQL Analysis
     runs-on: ubuntu-22.04
     permissions:
       actions: read
@@ -44,7 +44,6 @@ jobs:
 
   deploy-test:
     name: TEST Deploys
-    needs: [codeql]
     environment: test
     env:
       ZONE: test
@@ -91,7 +90,7 @@ jobs:
             -p ZONE=${{ env.ZONE }} ${{ matrix.parameters }}
 
   certbot-test:
-    name: Certbot
+    name: TEST Certbot
     needs: [deploy-test]
     environment: test
     runs-on: ubuntu-22.04
@@ -107,9 +106,24 @@ jobs:
           # Run certbot with one-off job
           oc create job "certbot-manual-$(date +%s)" --from=cronjob/certbot
 
+  image-promotions:
+    name: PROD Promotions
+    needs: [deploy-test]
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        component: [api, admin, db, public]
+    steps:
+      - uses: shrink/actions-docker-registry-tag@v3
+        with:
+          registry: ghcr.io
+          repository: ${{ github.repository }}/${{ matrix.component }}
+          target: test
+          tags: prod
+
   deploy-prod:
     name: PROD Deploys
-    needs: [codeql, deploy-test]
+    needs: [image-promotions]
     environment: prod
     env:
       ZONE: prod
@@ -150,11 +164,11 @@ jobs:
           overwrite: ${{ matrix.overwrite }}
           penetration_test: false
           parameters:
-            -p PROMOTE=ghcr.io/${{ github.repository }}/${{ matrix.name }}:test
+            -p PROMOTE=ghcr.io/${{ github.repository }}/${{ matrix.name }}:prod
             -p ZONE=${{ env.ZONE }} ${{ matrix.parameters }}
 
   certbot-prod:
-    name: Certbot
+    name: PROD Certbot
     needs: [deploy-prod]
     environment: prod
     runs-on: ubuntu-22.04
@@ -169,18 +183,3 @@ jobs:
 
           # Run certbot with one-off job
           oc create job "certbot-manual-$(date +%s)" --from=cronjob/certbot
-
-  image-promotions:
-    name: Promote images to PROD
-    needs: [deploy-prod]
-    runs-on: ubuntu-22.04
-    strategy:
-      matrix:
-        component: [api, admin, db, public]
-    steps:
-      - uses: shrink/actions-docker-registry-tag@v3
-        with:
-          registry: ghcr.io
-          repository: ${{ github.repository }}/${{ matrix.component }}
-          target: test
-          tags: prod