diff --git a/Jenkinsfile b/Jenkinsfile index e2fa0e2..8c795d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -105,7 +105,6 @@ spec: container('builder') { sh ''' set -euo pipefail - apk add --no-cache bash git jq mkdir -p /root/.docker cp /docker-config/config.json /root/.docker/config.json ''' @@ -116,19 +115,15 @@ spec: steps { container('builder') { script { - sh 'git config --global --add safe.directory /home/jenkins/agent/workspace/atlasbot' - def semver = sh(returnStdout: true, script: 'git describe --tags --exact-match || true').trim() - if (!semver) { - def base = sh(returnStdout: true, script: 'cat VERSION_BASE 2>/dev/null || true').trim() - if (!base) { - base = "0.1.0" - } - def buildNum = env.BUILD_NUMBER?.trim() - if (!buildNum) { - buildNum = sh(returnStdout: true, script: 'git rev-list --count HEAD').trim() - } - semver = "${base}-${buildNum}" + def base = sh(returnStdout: true, script: 'cat VERSION_BASE 2>/dev/null || true').trim() + if (!base) { + base = "0.1.0" } + def buildNum = env.BUILD_NUMBER?.trim() + if (!buildNum) { + buildNum = "0" + } + def semver = "${base}-${buildNum}" sh "echo SEMVER=${semver} > build.env" } }