From 4ac7a1fac21329cf5cb8b7842b8a40eb8a1e19d2 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Sun, 12 Jul 2020 13:47:15 -0400 Subject: [PATCH] ci: Regenerate .pot only after rebasing to 'translations' branch Otherwise we will get conflicts Signed-off-by: Cole Robinson --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43f1226e3..9880da93b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,10 +36,11 @@ jobs: git config --global user.email "actions@github.com" git config --global user.name "Github Actions" - git commit po/virt-manager.pot \ - --message "Refresh translation .pot template" git fetch --all git rebase remotes/origin/translations + git commit po/virt-manager.pot \ + --message "Refresh translation .pot template" + remote_repo="https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git" git push "${remote_repo}" HEAD:translations