From d78f6cab6ab9f6b8aa8f72cab550fec2a12ef231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Fri, 14 Jun 2024 21:44:23 +0200 Subject: [PATCH] fix(ci): use --tags to match non-annotated tags MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently tags used in the project are a mix of annotated and non-annotated/lightweight tags. Without `--tags` flag `git describe` will not take into account annotated tags. Signed-off-by: Jakub SokoĊ‚owski --- ci/Jenkinsfile.release | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/Jenkinsfile.release b/ci/Jenkinsfile.release index 476b09ae22..5ea0751e13 100644 --- a/ci/Jenkinsfile.release +++ b/ci/Jenkinsfile.release @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.8.9' +library 'status-jenkins-lib@v1.8.17' pipeline { agent { label 'linux' } @@ -68,7 +68,7 @@ pipeline { "${params.IMAGE_NAME}:${params.IMAGE_TAG ?: env.GIT_COMMIT.take(8)}", "--label=build='${env.BUILD_URL}' " + "--label=commit='${git.commit()}' " + - "--label=version='${git.describe()}' " + + "--label=version='${git.describe('--tags')}' " + "--build-arg=MAKE_TARGET='${params.MAKE_TARGET}' " + "--build-arg=NIMFLAGS='${params.NIMFLAGS} -d:postgres ' " + "--build-arg=LOG_LEVEL='${params.LOWEST_LOG_LEVEL_ALLOWED}' " +