Merge pull request #453 from web-token/3.2.x-merge-up-into-4.0.x_4AHcy0yE

Merge release 3.2.4 into 4.0.x

Author: Spomky

.github/workflows/gitsplit.yml

@@ -1,13 +1,11 @@
 name: gitsplit
 on:
   push:
-    branches:
-      - "*.x"
     tags:
       - '*'
 
 env:
-  GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+  GITHUB_TOKEN: ${{ secrets.GITSPLIT_TOKEN }}
 
 jobs:
   packages_split:
@@ -116,8 +114,8 @@ jobs:
           #repository_host: git.private.com:1234
 
           # ↓ the user signed under the split commit
-          user_name: "Florent Morselli"
-          user_email: "florent.morselli@spomky-labs.com"
+          user_name: ${{ secrets.GIT_AUTHOR_NAME }}
+          user_email: ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       # with tag
       -
@@ -137,5 +135,5 @@ jobs:
           #repository_host: git.private.com:1234
 
           # ↓ the user signed under the split commit
-          user_name: "Florent Morselli"
-          user_email: "florent.morselli@spomky-labs.com"
+          user_name: ${{ secrets.GIT_AUTHOR_NAME }}
+          user_email: ${{ secrets.GIT_AUTHOR_EMAIL }}

.github/workflows/release-on-milestone-closed.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   release:
-    name: "GIT tag, release & create merge-up PR"
+    name: "Release"
     runs-on: ubuntu-latest
 
     steps:
@@ -27,6 +27,16 @@ 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@v3"
+
       - name: "Create Merge-Up Pull Request"
         uses: "laminas/automatic-releases@1.24.0"
         with:
@@ -38,6 +48,16 @@ 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@v3"
+
       - name: "Create and/or Switch to new Release Branch"
         uses: "laminas/automatic-releases@1.24.0"
         with:
@@ -49,6 +69,16 @@ 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@v3"
+
       - name: "Bump Changelog Version On Originating Release Branch"
         uses: "laminas/automatic-releases@1.24.0"
         with:
@@ -60,6 +90,16 @@ 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@v3"
+
       - name: "Create new milestones"
         uses: "laminas/automatic-releases@1.24.0"
         with: