From c1e2f429ebe08a378b8fa1eee307c233597207f0 Mon Sep 17 00:00:00 2001
From: Vojdan Kjorveziroski <vojdan.kjorveziroski@finki.ukim.mk>
Date: Mon, 28 Apr 2025 13:04:59 +0200
Subject: [PATCH] bump version

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70df3c4..93a612a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,9 +20,9 @@ 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 fetch origin $CI_COMMIT_REF_NAME
+    - git reset --hard origin/$CI_COMMIT_REF_NAME
     - git status
-    - git pull
-    - git rebase --continue
     - 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)
     - export CURRENT_CHART_APP_VERSION=$(yq e '.appVersion' charts/$CHART_NAME/Chart.yaml)
-- 
GitLab