Add diagnostic info to merge messages

This might be useful in case of debugging a problem
pmmp · Aug 13, 2024 · 415f994 · 415f994
1 parent e6239b5
commit 415f994
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/.github/workflows/pocketmine-mp-branch-sync.yml b/.github/workflows/pocketmine-mp-branch-sync.yml
@@ -33,13 +33,25 @@ jobs:
     - name: Merge "stable" into "minor-next" and push changes
       if: contains(fromJSON('["minor-next", "*"]'), github.event.inputs.branch)
       run: |
-        git checkout -f minor-next
-        git pull --ff origin stable
+        LOWER_BRANCH="stable"
+        TARGET_BRANCH="minor-next"
+        git checkout -f "$TARGET_BRANCH"
+        git pull --no-commit --ff origin "$LOWER_BRANCH"
+        git commit \
+          -m "Merge '$LOWER_BRANCH' into '$TARGET_BRANCH'" \
+          -m "Automatic merge performed by: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+          || true # suppress error in case of fast-forward merge
         git push
 
     - name: Merge "minor-next" into "major-next" and push changes
       if: contains(fromJSON('["major-next", "*"]'), github.event.inputs.branch)
       run: |
-        git checkout -f major-next
-        git pull --ff origin minor-next
+        LOWER_BRANCH="minor-next"
+        TARGET_BRANCH="major-next"
+        git checkout -f "$TARGET_BRANCH"
+        git pull --no-commit --ff origin "$LOWER_BRANCH"
+        git commit \
+          -m "Merge '$LOWER_BRANCH' into '$TARGET_BRANCH'" \
+          -m "Automatic merge performed by: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+          || true # suppress error in case of fast-forward merge
         git push