From dd0cc5fdb12dd4ccb76ff7237215c156d0386c05 Mon Sep 17 00:00:00 2001 From: zachmann <gabriel.zachmann@kit.edu> Date: Thu, 10 Nov 2022 15:28:24 +0100 Subject: [PATCH] [ci] fix set-prerel-version script --- .gitlab-ci-scripts/set-prerel-version | 4 ++++ .gitlab-ci.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci-scripts/set-prerel-version b/.gitlab-ci-scripts/set-prerel-version index f26ee614..a1e598ca 100755 --- a/.gitlab-ci-scripts/set-prerel-version +++ b/.gitlab-ci-scripts/set-prerel-version @@ -3,6 +3,10 @@ MASTER_BRANCH=master VERSION_FILE=internal/model/version/VERSION +git config --global --add safe.directory "$PWD" +git config user.email "ci@repo.data.kit.edu" +git config user.name "cicd" + PREREL=$(git rev-list --count HEAD ^$MASTER_BRANCH) VERSION=$(cat $VERSION_FILE) FULL_VERSION="${VERSION}-pr${PREREL}" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a93a54b..cbb460ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ prerelease: REPO_HOST: repo.data.kit.edu REPO_USER: cicd script: - - .gitlab-ci-scripts/set-prerel-version + - docker run --rm -v $PWD:/tmp/mytoken -w /tmp/mytoken bitnami/git .gitlab-ci-scripts/set-prerel-version - .gitlab-ci-scripts/goreleaser.sh - .gitlab-ci-scripts/upload.sh after_script: -- GitLab