summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorCole Robinson <crobinso@redhat.com>2020-07-12 13:47:15 -0400
committerCole Robinson <crobinso@redhat.com>2020-07-12 13:47:15 -0400
commit4ac7a1fac21329cf5cb8b7842b8a40eb8a1e19d2 (patch)
tree4341364a0915f8feb358b0e554cbb97760f6f7cf /.github
parent25419db9caf0e45578e98d85af096fab52a3c7cc (diff)
downloadvirt-manager-4ac7a1fac21329cf5cb8b7842b8a40eb8a1e19d2.tar.gz
ci: Regenerate .pot only after rebasing to 'translations' branch
Otherwise we will get conflicts Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/ci.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43f1226e..9880da93 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