diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 368c7816..1f83c68b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,12 +86,12 @@ package: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin "$DOCKER_REGISTRY" script: - | - [[ "$CI_COMMIT_TAG" == "${PREREL_BRANCH_NAME}" ]] && { + [[ "$CI_COMMIT_BRANCH" == "${PREREL_BRANCH_NAME}" ]] && { echo "Running set-prerel-version" .gitlab-ci-scripts/set-prerel-version.sh } - [[ "$CI_COMMIT_TAG" != "${PREREL_BRANCH_NAME}" ]] && { - [[ "$CI_COMMIT_TAG" != "${CI_DEFAULT_BRANCH}" ]] && { + [[ "$CI_COMMIT_BRANCH" != "${PREREL_BRANCH_NAME}" ]] && { + [[ "$CI_COMMIT_BRANCH" != "${CI_DEFAULT_BRANCH}" ]] && { # we're on a devel branch echo "Running set-devel-version" .gitlab-ci-scripts/set-prerel-version.sh --devstring dev