Merge pull request #117 from NHSDigital/feature/terb-ELID-131-automated-deployment-networking-api

adding in improvements from meeting

Author: TOEL2

.github/workflows/cicd-1-pull-request.yaml

@@ -3,14 +3,12 @@ name: "CI/CD pull request"
 # The total recommended execution time for the "CI/CD Pull Request" workflow is around 20 minutes.
 
 on:
-  push:
-    branches:
-      - "**"
   pull_request:
-    types: [opened, reopened]
+    types: [opened, synchronize, reopened]
 
 jobs:
   metadata:
+    if: github.event.pull_request.draft == false
     name: "Set CI/CD metadata"
     runs-on: ubuntu-latest
     timeout-minutes: 1
@@ -69,6 +67,7 @@ jobs:
           make list-variables
   commit-stage: # Recommended maximum execution time is 2 minutes
     name: "Commit stage"
+    if: github.event.pull_request.draft == false
     needs: [metadata]
     uses: ./.github/workflows/stage-1-commit.yaml
     with:
@@ -82,6 +81,7 @@ jobs:
     secrets: inherit
   test-stage: # Recommended maximum execution time is 5 minutes
     name: "Test stage"
+    if: github.event.pull_request.draft == false
     needs: [metadata, commit-stage]
     uses: ./.github/workflows/stage-2-test.yaml
     with:

.github/workflows/cicd-3-deploy.yaml

@@ -18,6 +18,15 @@ on:
           - test
           - preprod
           - prod
+      release_type:
+        description: "Version bump type (patch, minor, major)"
+        required: false
+        default: "patch"
+        type: choice
+        options:
+          - patch
+          - minor
+          - major
 
 jobs:
   metadata:
@@ -70,7 +79,7 @@ jobs:
     timeout-minutes: 10
     permissions:
       id-token: write
-      contents: read
+      contents: write
     steps:
       - name: "Setup Terraform"
         uses: hashicorp/setup-terraform@v3
@@ -124,7 +133,21 @@ jobs:
           else
             # Extract the version numbers
             IFS='.' read -r major minor patch <<< "${latest_tag#v}"
-            patch=$((patch + 1))
+            case "${{ github.event.inputs.release_type }}" in
+              major)
+              major=$((major + 1))
+              minor=0
+              patch=0
+              ;;
+              minor)
+              minor=$((minor + 1))
+              patch=0
+              ;;
+            patch|*)
+              patch=$((patch + 1))
+              ;;
+            esac
+
             next_tag="v${major}.${minor}.${patch}"
           fi
 
@@ -136,8 +159,8 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ steps.next_tag.outputs.next_tag }}
-          release_name: Release ${{ steps.next_tag.outputs.next_tag }}
+          tag_name: ${{ steps.next_tag.outputs.tag }}
+          release_name: Release ${{ steps.next_tag.outputs.tag }}
           body: |
             Auto-release created during deployment.
           draft: false