(ELI-466) addressing comments

Author: TOEL2

.act/act_tests.mk

@@ -1,8 +1,8 @@
 ACT_IMAGE = ghcr.io/nhs-england-tools/github-runner-image:20230909-321fd1e-rt
 PREPROD_WORKFLOW  = .github/workflows/cicd-4-preprod-deploy.yaml
-JOB       = metadata
+JOB       = metadata # This can be changed depending on which part of the workflow we are testing
 
-# Usage: make act EVENT=.act/workflow_run_preprod.json TRIGGER_TYPE=workflow_run
+# Usage: make act EVENT=.act/auto_preprod_trigger_*.json TRIGGER_TYPE=workflow_run
 act-preprod-deploy:
 	@if [ -z "$(EVENT)" ]; then \
 		echo "Usage: make act EVENT=<path-to-event-json>"; \

.github/workflows/cicd-4-preprod-deploy.yaml

@@ -37,7 +37,7 @@ jobs:
       release_type: ${{ steps.release_type.outputs.release_type }}
 
     env:
-      TEST_WORKFLOW_ID: "190123511"
+      TEST_WORKFLOW_ID: "190123511" # this will need updating if the workflow is recreated
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

DEPLOYMENT.md

@@ -109,7 +109,7 @@ Releases are immutable and auditable:
 ### When to use which `release_type`
 
 - We should not normally be manually deploying, the auto deploy should take care of it
-- Manual deploy to brake glass
+- Manual deploy to break glass
 - Use **`patch`/`minor`/`major`** when starting a **new base version** (first RC becomes `-rc.1`).
 - Use **`rc`** when you need another candidate for the **same base** (`-rc.N+1`).
 

scripts/workflow/release_type_resolver.py

@@ -39,11 +39,10 @@
 )
 
 def pick_highest(labels: Iterable[str]) -> str | None:
-    labels = list(labels)
-    if any(l == "release:major" for l in labels): return "major"
-    if any(l == "release:minor" for l in labels): return "minor"
-    if any(l == "release:patch" for l in labels): return "patch"
-    if any(l == "release:rc"    for l in labels): return "rc"
+    s = set(labels)
+    for level in ("major", "minor", "patch", "rc"):
+        if level in s:
+            return level
     return None
 
 def manual_override() -> str | None: