From 6e707c44f4670db887ae0ecabcd9c38c608b0288 Mon Sep 17 00:00:00 2001
From: Sam Plackett <samuel.plackett@eviden.com>
Date: Fri, 10 Jan 2025 14:55:14 +0000
Subject: [PATCH 1/3] add github action for version bump

---
 .github/workflows/main.yml | 77 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 00000000..25d48d42
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,77 @@
+name: Version Bump
+
+on:
+  pull_request:
+    types: [opened, reopened]
+
+jobs:
+  version-bump:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.head_ref }}
+          fetch-depth: 0
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Set up GPG keys for signing
+        run: |
+          echo "$GPG_PRIVATE_KEY" | gpg --batch --import
+          git config --global user.signingkey ${{ secrets.GPG_KEY_ID }}
+          git config --global commit.gpgsign true
+          git config --global user.email ${{ secrets.GPG_EMAIL }}
+          git config --global user.name ${{ secrets.GPG_NAME }}
+        env:
+          GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }}
+          GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }}
+          GPG_EMAIL: ${{ secrets.GPG_EMAIL }}
+          GPG_NAME: ${{ secrets.GPG_NAME }}
+
+      - name: Commit dependency updates with GPG sign
+        run: |
+          git add package-lock.json
+          git commit -S -m "update package-lock.json" || echo "No changes to commit"
+
+      - name: Fetch main branch
+        run: git fetch origin main
+
+      - name: Merge main into feature branch
+        run: |
+          git merge origin/main --no-commit
+        continue-on-error: true
+
+      - name: Check for merge conflicts
+        run: |
+          if [[ $(git ls-files -u | wc -l) -gt 0 ]]; then
+            echo "Merge conflicts detected. Exiting without version bump."
+            exit 0
+          else
+            echo "Merge successful. Proceeding with version bump."
+          fi
+        shell: bash
+
+      - name: Commit merged changes
+        run: |
+          git commit -S -m "merge main into feature branch" || echo "No changes to commit"
+
+      - name: Bump version number
+        run: |
+          npm version patch
+
+      - name: Ensure branch is checked out
+        run: |
+          git checkout ${{ github.head_ref }}
+
+      - name: Push version bump and commit with GPG sign
+        run: |
+          git push --set-upstream origin ${{ github.head_ref }} --force
+          git push --tags

From e0289285c86bd732bf2300c0910fb355276ac6fe Mon Sep 17 00:00:00 2001
From: ffcplatform <ffcplatforms@environment-agency.gov.uk>
Date: Fri, 10 Jan 2025 14:55:52 +0000
Subject: [PATCH 2/3] update package-lock.json

---
 package-lock.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 16456ae3..b87a752e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ffc-pay-processing",
-  "version": "2.55.26",
+  "version": "2.55.35",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ffc-pay-processing",
-      "version": "2.55.26",
+      "version": "2.55.35",
       "license": "OGL-UK-3.0",
       "dependencies": {
         "@azure/identity": "4.3.0",

From 69c092a604f20f5903d3e764f909c59e80407bbb Mon Sep 17 00:00:00 2001
From: ffcplatform <ffcplatforms@environment-agency.gov.uk>
Date: Fri, 10 Jan 2025 14:55:52 +0000
Subject: [PATCH 3/3] 2.55.36

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b87a752e..01ddcfbb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ffc-pay-processing",
-  "version": "2.55.35",
+  "version": "2.55.36",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ffc-pay-processing",
-      "version": "2.55.35",
+      "version": "2.55.36",
       "license": "OGL-UK-3.0",
       "dependencies": {
         "@azure/identity": "4.3.0",
diff --git a/package.json b/package.json
index 09e7f0f3..bfebc395 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ffc-pay-processing",
-  "version": "2.55.35",
+  "version": "2.55.36",
   "description": "Payment Hub processing service",
   "homepage": "https://github.com/DEFRA/ffc-pay-processing",
   "main": "app/index.js",