From 3fcf7081e63620becfa8ade4dec3b1fedaa3da98 Mon Sep 17 00:00:00 2001 From: Vojdan Kjorveziroski <vojdan.kjorveziroski@finki.ukim.mk> Date: Mon, 28 Apr 2025 12:58:56 +0200 Subject: [PATCH] bump version --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c99db72..37aeb81 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) -- GitLab