diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2c31a4..dbb1f9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,6 +113,13 @@ bump-version: script: - apk add --no-cache git - | + git config user.name "GitLab CI" + git config user.email "ci@adriahub.de" + git remote set-url origin "http://oauth2:${CI_PUSH_TOKEN}@192.168.1.100:9080/${CI_PROJECT_PATH}.git" + git fetch origin main + git checkout -f main + git pull --rebase origin main + VERSION=$(cat VERSION) MAJOR=$(echo "$VERSION" | cut -d. -f1) MINOR=$(echo "$VERSION" | cut -d. -f2) @@ -123,13 +130,6 @@ bump-version: echo "$NEXT_VERSION" > VERSION echo "Bumped version: $VERSION -> $NEXT_VERSION" - git config user.name "GitLab CI" - git config user.email "ci@adriahub.de" - git remote set-url origin "http://oauth2:${CI_PUSH_TOKEN}@192.168.1.100:9080/${CI_PROJECT_PATH}.git" - git fetch origin main - git checkout main - git pull --rebase origin main - echo "$NEXT_VERSION" > VERSION git add VERSION git commit -m "v${NEXT_VERSION} [skip ci]" git push origin main