Merge release strategy changes into 'main' (#1336)

* Tweaks to release pipeline (#1332)

* Set environment based on different push events (#1330)

* Fix: Forgot to define the branch variable (#1331)

* Set error message on failure

* Fix tag name syntax

* Check source branches have hotfix or feature prefixes (#1334)

* Open dependencies against main and staging (#1335)

.github/workflows/branch-protection-checks.yml

@@ -0,0 +1,25 @@
+name: Validate source branch
+
+on:
+  pull_request:
+    branches:
+      - main
+      - staging
+
+jobs:
+  check:
+    name: Incoming branch validation
+    runs-on: ubuntu-latest
+    steps:
+      - id: branch
+        name: Check branch name
+        run: |
+          GIT_BRANCH=${{ github.head_ref }}
+          if [[ "$GIT_BRANCH" =~ ^hotfix/*|^feature/*|^renovate/* ]];
+          then
+            echo "'$GIT_BRANCH' is a permitted branch"
+            exit 0
+          else
+            echo "'$GIT_BRANCH' is not a permitted branch"
+            exit 1
+          fi

.github/workflows/build-and-push-image.yml

@@ -62,6 +62,7 @@ jobs:
             else
               # Only main and staging branches can auto-deploy via push trigger
               # Exit with failure
+              echo "Only 'main' and 'staging' branches can be deployed via a push trigger"
               exit 1
             fi
           fi
@@ -70,7 +71,7 @@ jobs:
       - id: release
         name: Set release name
         run: |
-          RELEASE=${${{ steps.environment.outputs.environment }},,}-`date +%Y-%m-%d`.${{ github.run_number }}
+          RELEASE=${{ steps.environment.outputs.environment }}-`date +%Y-%m-%d`.${{ github.run_number }}
           echo "release=${RELEASE}" >> $GITHUB_OUTPUT
 
   deploy-image:

renovate.json

@@ -16,6 +16,7 @@
   ],
   "timezone": "Europe/London",
   "minimumReleaseAge": "7 days",
+  "baseBranches": ["main", "staging"],
   "automergeSchedule": ["after 10am every weekday", "before 4pm every weekday"],
   "labels": ["dependencies", "renovate"],
   "vulnerabilityAlerts": {