diff options
| author | Antenore Gatta <antenore@simbiosi.org> | 2019-01-31 11:15:06 +0300 |
|---|---|---|
| committer | Antenore Gatta <antenore@simbiosi.org> | 2019-01-31 11:15:06 +0300 |
| commit | 30361758f238a38ec0f783fb9bc65b7860c6f429 (patch) | |
| tree | 08348b9972ba1d60e004d837d1400dc7a00b5c9c | |
| parent | 0eb5aaae17c8c940b4836dc1fd5c70477f1b4305 (diff) | |
Avoiding merging conflicts
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b1d5606..fc18bfe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,11 @@ variables: GIT_SUBMODULE_STRATEGY: recursive stages: - - updsource + - upddoc + - updi18n remminadoc build: - stage: updsource + stage: upddoc before_script: - apt-get update -qq - apt-get install -y -qq software-properties-common @@ -36,7 +37,7 @@ remminadoc build: - git push origin master remminai18n build: - stage: updsource + stage: updi18n before_script: - apt-get update -qq - apt-get install -y -qq software-properties-common @@ -57,4 +58,3 @@ remminai18n build: - scripts/update-translations.sh - 'git diff --exit-code --quiet origin/master || { scripts/i18nstats.sh ; git commit -am "Automatic translations by remmina-ci" ;}' - git push origin master - |