Skip to content

Commit 177149b

Browse files
committed
Run git pull after ghcommit in update.yml
This is necessary, because `ghcommit` validates that the remote state matches the local state and refuses to commit the PHP changes, if the same run also made daemon changes.
1 parent 6baa9d4 commit 177149b

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

.github/workflows/update.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,13 @@ jobs:
3939
-b main \
4040
--add daemon/Dockerfile \
4141
--message "Update to tideways-daemon $(awk '$1 == "ENV" && $2 == "TIDEWAYS_DAEMON_VERSION"{print $3}' daemon/Dockerfile)"
42+
git pull
4243
fi
4344
4445
if ! git diff --quiet php/Dockerfile; then
4546
ghcommit -r ${{ github.repository }} \
4647
-b main \
4748
--add php/Dockerfile --add php/alpine/Dockerfile \
4849
--message "Update to tideways-php $(awk '$1 == "ENV" && $2 == "TIDEWAYS_PHP_VERSION"{print $3}' php/Dockerfile)"
50+
git pull
4951
fi

0 commit comments

Comments
 (0)