diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75131aa..3d4179e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,6 +55,7 @@ remminai18n build: - scripts/i18nstats.sh - 'git diff --exit-code --quiet origin/master || git commit -am "Updating pot file via remmina-ci"' - lftp -e "cd $REM_CWD/stats ; put data/reports/chartkick.min.js; put data/reports/postats.html; exit" -u "$REM_USER,$REM_PASWD" "$REM_SERVER" + - 'git fetch ; git merge --ff --commit -m "Automatic merge from CI"' - git push origin master when: on_success |