From 19e1f086dc3713d573d857faa72e83e0867368af Mon Sep 17 00:00:00 2001
From: Ben Dalling <b.dalling@cbdq.io>
Date: Tue, 14 May 2024 15:34:35 +0100
Subject: [PATCH 1/2] fix: Update deprecated GitHub action.

---
 .github/workflows/pipeline.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
index 76f1d7e..58f4425 100644
--- a/.github/workflows/pipeline.yaml
+++ b/.github/workflows/pipeline.yaml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Log in to the Container Registry
         if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/develop'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}

From 18807c8b35ca8b20df52af7a94d552a4ec5a44f6 Mon Sep 17 00:00:00 2001
From: Ben Dalling <b.dalling@cbdq.io>
Date: Tue, 14 May 2024 15:46:19 +0100
Subject: [PATCH 2/2] new: dev: Add Git Flow action.

---
 .github/workflows/gitflow.yml | 40 +++++++++++++++++++++++++++++++++++
 Makefile                      |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 .github/workflows/gitflow.yml

diff --git a/.github/workflows/gitflow.yml b/.github/workflows/gitflow.yml
new file mode 100644
index 0000000..aaf0297
--- /dev/null
+++ b/.github/workflows/gitflow.yml
@@ -0,0 +1,40 @@
+---
+name: Git Flow
+
+on:
+  # Run on any pull request, or any push of a branch (avoiding pushing of
+  # tags).
+  pull_request:
+    branches:
+      - '*'
+      - '**'
+  push:
+    branches:
+      - '*'
+      - '**'
+    tags:
+      - '!*'  # This excludes all tags
+
+jobs:
+  GitFlow:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Retrieve Release Candidate Name
+        id: version
+        run: echo "RELEASE_CANDIDATE_TAG=$( make tag )" >> $GITHUB_OUTPUT
+
+      - name: Git Flow Action
+        uses: cbdq-io/gitflow-action@v1
+        env:
+          # Setting this environment variable means we can debug by re-running
+          # workflows and ticking "Enable debug logging".
+          ACTIONS_RUNNER_DEBUG: ${{ runner.debug }}
+
+          GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
+        with:
+          # Set the release candidate to be the output of the previous step.
+          release-candidate: ${{ steps.version.outputs.RELEASE_CANDIDATE_TAG }}
diff --git a/Makefile b/Makefile
index 8848528..71a9144 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,8 @@ pushTag:
 releaseBranch:
 	git flow release start $(TAG)
 
+tag:
+	@echo $(TAG)
 test:
 	docker compose up -d --wait odoo
 	docker compose exec odoo /usr/local/bin/restore.sh -a secret -d odoo -f /mnt/restore/odoo.zip