Skip to content

Commit 6dd0cca

Browse files
committed
ci: fix push rejection in sync workflows
1 parent cb5adad commit 6dd0cca

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/sync-docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ jobs:
9797
git config user.name "github-actions[bot]"
9898
git config user.email "github-actions[bot]@users.noreply.github.com"
9999
git add docs.zenc-lang.org/content/std/ docs.zenc-lang.org/content/examples/rosetta/ docs.zenc-lang.org/content/tour/
100-
git diff --quiet && git diff --staged --quiet || (git commit -m "docs: auto-sync documentation and rosetta examples" && git push)
100+
git diff --quiet && git diff --staged --quiet || (git commit -m "docs: auto-sync documentation and rosetta examples" && git pull --rebase origin main && git push)

.github/workflows/sync-www.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,6 @@ jobs:
5656
echo "No changes to commit"
5757
else
5858
git commit -m "docs/site: Sync language reference and i18n infrastructure"
59+
git pull --rebase origin main
5960
git push
6061
fi

0 commit comments

Comments
 (0)