From 658ed12a85a6b31fa312b89cd92f3a4ce6df4c6b Mon Sep 17 00:00:00 2001
From: Florent Morselli <florent.morselli@spomky-labs.com>
Date: Mon, 29 Jan 2024 21:33:48 +0100
Subject: [PATCH] updated merge action

---
 .../workflows/release-on-milestone-closed.yml | 56 ++++++++++++++++---
 1 file changed, 49 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
index a5f1511..b9986a8 100644
--- a/.github/workflows/release-on-milestone-closed.yml
+++ b/.github/workflows/release-on-milestone-closed.yml
@@ -9,15 +9,15 @@ on:
 
 jobs:
   release:
-    name: "GIT tag, release & create merge-up PR"
+    name: "Release"
     runs-on: ubuntu-latest
 
     steps:
       - name: "Checkout"
-        uses: "actions/checkout@v3"
+        uses: "actions/checkout@v4"
 
       - name: "Release"
-        uses: "laminas/automatic-releases@1.19.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:release"
         env:
@@ -27,8 +27,18 @@ jobs:
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
+  merge-up:
+    name: "Create Merge-Up Pull Request"
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: "release"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+
       - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@1.19.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:create-merge-up-pull-request"
         env:
@@ -38,8 +48,18 @@ jobs:
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
+  switch:
+    name: "Create and/or Switch to new Release Branch"
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: "merge-up"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+
       - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@1.19.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
         env:
@@ -49,8 +69,20 @@ jobs:
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
+  bump:
+    name: "Bump Changelog Version On Originating Release Branch"
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: "switch"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+        with:
+          fetch-depth: 0
+
       - name: "Bump Changelog Version On Originating Release Branch"
-        uses: "laminas/automatic-releases@1.19.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:bump-changelog"
         env:
@@ -60,8 +92,18 @@ jobs:
           "GIT_AUTHOR_NAME": ${{ secrets.GIT_AUTHOR_NAME }}
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
+  milestones:
+    name: "Create new milestones"
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: "bump"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v4"
+
       - name: "Create new milestones"
-        uses: "laminas/automatic-releases@1.19.0"
+        uses: "laminas/automatic-releases@1.24.0"
         with:
           command-name: "laminas:automatic-releases:create-milestones"
         env: