diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2020-06-04 16:31:16 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2020-06-04 16:31:16 +0300 |
| commit | 90f0bbc07b73099efeb16b24e2e49c540b90222a (patch) | |
| tree | a1866136d96fa2fb540b8beab32b1d90162f9d72 | |
| parent | 90be7e04d04dd501efd6c61ec74ed6560ba942b5 (diff) | |
Adding fetch and merge command
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 3d4179e..2a5c567 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,6 +31,7 @@ remminadoc build: - cd ../RemminaDoc - git add --all - 'git diff --exit-code --quiet origin/master || git commit -am "Automatic doc build by remmina-ci"' + - 'git fetch ; git merge --ff --commit -m "Automatic merge from CI"' - git push origin master when: on_success |