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