diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07398cd12c823dbcad2932aca2185a210b24bd65..6beee7980025f63f4e59857102633c88fd7f2c8e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ version-bump-dev: - export MASTER_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml) - git checkout $CI_COMMIT_REF_NAME - git branch --set-upstream-to=origin/$CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME + - git rebase --quit - git pull - export CURRENT_CHART_VERSION=$(yq e '.version' charts/$CHART_NAME/Chart.yaml) - export CURRENT_DOCKER_IMAGE_VERSION=$(yq e '.platform.image.tag' charts/$CHART_NAME/values.yaml)