diff options
| author | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2021-01-19 10:56:47 +0100 |
|---|---|---|
| committer | Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at> | 2021-01-19 10:56:47 +0100 |
| commit | f971760d832bd6f48f7adf313ef5a1e91eda4ae4 (patch) | |
| tree | 6d9247ea2c4959ee2042ca61d561840ff14d6ed6 | |
| parent | 6560a412d4eaafcfede6cbb50ab48c5dd32aecd8 (diff) | |
| download | xfce4-dev-tools-f971760d832bd6f48f7adf313ef5a1e91eda4ae4.tar.gz | |
xfce-build: Fix conditional in gitlabci
| -rw-r--r-- | .gitlab-ci.yml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8276fd..00751e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,10 +27,9 @@ build-container: - docker cp xfce-docs:/docs apidocs - docker rm -f xfce-docs # This will push to the branch name tag - - if [ -z "$CI_REGISTRY_PASSWORD" ]; then docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY && docker push $IMAGE_TAG; else echo Skipping pushing the image; fi # May eventually want to add some tests before latest is pushed? # In any case, only push latest if we are building master. - - if [ $CI_COMMIT_BRANCH == "master" ]; then docker push $LATEST_TAG; else echo Skipping latest tag on non-master branch; fi + - if [ $CI_COMMIT_BRANCH == "master" ]; then docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY && docker push $IMAGE_TAG && docker push $LATEST_TAG; else echo Skipping pushing the image on non-master branch; fi rules: # Set to only run on the branches of the official repo and when there # are relevant changes |