github: Fix weblate action's rights, and update generated code. #1262
Conversation
alexmv
force-pushed
the
action-rights-generated
branch
10 times, most recently
from
5b163dd to
6264d21
Compare
alexmv
force-pushed
the
action-rights-generated
branch
from
6264d21 to
7dff110
Compare
| git merge --ff-only weblate/main | ||
| GIT_COMMITTER_NAME="Hosted Weblate" GIT_COMMITTER_EMAIL="[email protected]" \ | ||
| git cherry-pick weblate/main ^HEAD |
There was a problem hiding this comment.
Hmm I guess there's a race where if origin/main just got updated and Weblate hasn't taken that update yet, the merge --ff-only will fail.
How about reset --hard? Then the PR's base will be slightly behind the tip, but that's normal. We'll rebase it forward as part of merge like we do for many other PRs.
There was a problem hiding this comment.
Ah I see, this change is part of the "run on this PR" don't-merge commit. Never mind, then.
(There still is that race, but it's unlikely.)
There was a problem hiding this comment.
One option is we can git reset --hard weblate/main and let the PR potentially be behind main if weblate is lagging. Which means one might get a PR with "cannot merge" rather than the failure one gets with git merge --ff-only, which is that the whole action fails.
This replaces #1192, with the branch pushed to
zulip/zulip-flutterso that it can possibly be tested before merging.