diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c99db7274d4bb9f0ccc499f7bf974f26a19076db..37aeb81fb1e3a9b5d32680a8d2ec84ed8d32ad5c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +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 rebase --abort + - git rebase --continue - 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)