diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eaeeb81133878869d1cfd17b62d343e8bcf0d8c6..36a6461aa5094bdea844a04d83b3b13f15435f85 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,6 +21,7 @@ version-bump-dev: - git checkout $CI_COMMIT_REF_NAME - git branch --set-upstream-to=origin/$CI_COMMIT_REF_NAME $CI_COMMIT_REF_NAME - git status + - rm -fr ".git/rebase-merge" - 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)