From a7f35435160de119ddde7e0921a8829d9d5460e9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 22 Oct 2023 19:26:31 +0300 Subject: [PATCH] we don't need a separate demo stage now --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4c5d9b01a..28d7703e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ stages: - build - test - publish - - demo variables: ESLINT_PATHS: js plugins @@ -90,7 +89,7 @@ ttrss-fpm-pgsql-static:publish: DOCKERFILE: ${CI_PROJECT_DIR}/.docker/app/Dockerfile update-demo: - stage: demo + stage: publish image: ${HELM_IMAGE} variables: HELM_REPO: https://gitlab.tt-rss.org/tt-rss/helm-charts/tt-rss @@ -98,4 +97,6 @@ update-demo: - git clone ${HELM_REPO} chart - helm template tt-rss-demo chart --values .helm/values-demo.yaml --set imageTag=${CI_COMMIT_SHORT_SHA} - helm upgrade --atomic --install tt-rss-demo chart --values .helm/values-demo.yaml --set imageTag=${CI_COMMIT_SHORT_SHA} + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_REGISTRY_USER != null