diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2020-06-04 09:52:00 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2020-06-04 09:52:00 +0300 |
| commit | 90be7e04d04dd501efd6c61ec74ed6560ba942b5 (patch) | |
| tree | 542c9767427a84071ee28984552563fe0ce5e308 | |
| parent | 3ea032dce83e499f4bdd62390a0d27b0e008023f (diff) | |
Git fetc and merge before to push
Signed-off-by: Antenore Gatta <antenore@simbiosi.org>
| -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 |