Skip to content

Commit 6bbe74f

Browse files
alexmvgnprice
authored andcommitted
github: Maybe lag behind main, instead of failing a merge --ff-only.
1 parent 8742422 commit 6bbe74f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Diff for: .github/workflows/update-translations.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ jobs:
1818
run: |
1919
git remote add weblate https://hosted.weblate.org/git/zulip/zulip-flutter/
2020
git fetch weblate
21-
git merge --ff-only weblate/main
21+
# This may lag behind `main` if weblate is backlogged; this can
22+
# theoretically cause the PR to not be able to auto-merged, though
23+
# re-running the action once weblate has caught up should be
24+
# sufficient to fix that.
25+
git reset --hard weblate/main
2226
2327
- name: Clone Flutter SDK
2428
# We can't do a depth-1 clone, because we need the most recent tag

0 commit comments

Comments
 (0)