From 74c370d625c9aed58bb5a8b04dba2461788c3030 Mon Sep 17 00:00:00 2001 From: Pablo Zmdl Date: Fri, 6 Dec 2024 15:28:25 +0100 Subject: [PATCH 1/5] Fix creating branch GNU vs. BSD tools having different argument parsing again... --- .github/workflows/update-sh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index a8c6ff3e9..20966cfde 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -30,7 +30,7 @@ jobs: # Exit early if no changes are present. test $(git status --porcelain | wc -l) -gt 0 || { echo "No changes to commit, happily cancelling this script."; exit 0; } # Use a distinct branch-name (nano-seconds should be good enough). - BRANCH="changes-from-update.sh-$(date -I ns)" + BRANCH="changes-from-update.sh-$(date --iso-8601=ns)" git switch -C "$BRANCH" git config --local user.email "workflow@github.com" git config --local user.name "GitHub Workflow" From b3f6d42689a3dfb31701fe2d7f8261f8d21481dd Mon Sep 17 00:00:00 2001 From: Pablo Zmdl Date: Fri, 6 Dec 2024 15:30:58 +0100 Subject: [PATCH 2/5] DBG --- .github/workflows/update-sh.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index 20966cfde..fa977bab7 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -9,6 +9,7 @@ on: push: branches: - master + - update.sh-fix-branch-creation schedule: - cron: '11 0 * * *' workflow_dispatch: From aeeda82b22eab12e16e199f319f2e35e2083fa50 Mon Sep 17 00:00:00 2001 From: Pablo Zmdl Date: Fri, 6 Dec 2024 15:39:47 +0100 Subject: [PATCH 3/5] Use valid branch names --- .github/workflows/update-sh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index fa977bab7..ebc7f4d5d 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -31,7 +31,7 @@ jobs: # Exit early if no changes are present. test $(git status --porcelain | wc -l) -gt 0 || { echo "No changes to commit, happily cancelling this script."; exit 0; } # Use a distinct branch-name (nano-seconds should be good enough). - BRANCH="changes-from-update.sh-$(date --iso-8601=ns)" + BRANCH="changes-from-update.sh-$(date +'%Y-%m-%d_%H%M%S_%N')" git switch -C "$BRANCH" git config --local user.email "workflow@github.com" git config --local user.name "GitHub Workflow" From a87193a16ba56899cf20f46deeb7f81f0d28ce7c Mon Sep 17 00:00:00 2001 From: Pablo Zmdl Date: Fri, 6 Dec 2024 15:43:39 +0100 Subject: [PATCH 4/5] Fix creating pull request --- .github/workflows/update-sh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-sh.yml b/.github/workflows/update-sh.yml index ebc7f4d5d..537730014 100644 --- a/.github/workflows/update-sh.yml +++ b/.github/workflows/update-sh.yml @@ -38,4 +38,4 @@ jobs: git add -A git commit -m "Update roundcube version (via update.sh)" git push --set-upstream origin "$BRANCH" - 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 + gh pr create -B master -H "$BRANCH" --title 'Changes from update.sh' --body "These are the changes of the automated run of ./update.sh" --assignee pabzm From dc7249d395ad8a82899dd7587258a4cb73348404 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Fri, 6 Dec 2024 14:44:02 +0000 Subject: [PATCH 5/5] Update roundcube version (via update.sh) --- apache/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apache/Dockerfile b/apache/Dockerfile index 24e5c56c3..c2e5ecce0 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -56,6 +56,8 @@ RUN set -ex; \ ; \ docker-php-ext-enable imagick opcache redis; \ docker-php-source delete; \ +# Header files ".h" + rm -r /usr/local/include/php/ext; \ rm -r /tmp/pear; \ # Display installed modules php -m; \