From: Pablo Zmdl <redacted>
Date: Tue, 3 Dec 2024 17:58:18 +0000 (+0100)
Subject: CI: Fix working with branches with update.sh
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a716c1f53dea3cb0831438a2fd7e6a255b1710aa;p=roundcube-roundcubemail-docker.git

CI: Fix working with branches with update.sh
---

diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml
index 62c56e6..be8810d 100644
--- a/.github/workflows/update-sh.yml
+++ b/.github/workflows/update-sh.yml
@@ -3,6 +3,7 @@ name: update.sh
 permissions:
   # Git push permissions are needed
   contents: write
+  pull-requests: write
 
 on:
   push:
@@ -24,13 +25,15 @@ jobs:
       run: ./update.sh
     - name: Commit files
       run: |
+        BRANCH="changes-from-update.sh-$(date +'%Y-%m-%d')"
+        git show-ref --quiet "$BRANCH" && { "ERROR: Branch $BRANCH already exists";  exit 1; }
+        git switch -C "$BRANCH"
         git config --local user.email "workflow@github.com"
         git config --local user.name "GitHub Workflow"
-        git switch -C changes-from-update.sh
         git add -A
         git commit -m "Update roundcube version (via update.sh)" || echo "Nothing to update"
-        git push --set-upstream origin changes-from-update.sh
+        git push --set-upstream origin "$BRANCH"
     - name: Create Pull Request
-      run: gh pr create -B master -H changes-from-update.sh --title 'Changes from update.sh' --assignee pabzm
+      run: gh pr create -B master -H changes-from-update.sh --title 'Changes from update.sh' --body "These are the changes of the automated run of ./update.sh" --assignee pabzm
       env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}