From 604e92055dba69b000219a769158f619132942e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 20 Dec 2022 15:43:00 -0500
Subject: [PATCH] jenkinsfile: fix tag generation
Change-Id: I963d7064903c485c4aabacedf73a023a09f37efc
---
extras/packaging/gnu-linux/Jenkinsfile | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/extras/packaging/gnu-linux/Jenkinsfile b/extras/packaging/gnu-linux/Jenkinsfile
index 500556a8c..08c8ac99e 100644
--- a/extras/packaging/gnu-linux/Jenkinsfile
+++ b/extras/packaging/gnu-linux/Jenkinsfile
@@ -140,19 +140,22 @@ make -f extras/packaging/gnu-linux/Makefile portable-release-tarball .tarball-ve
sshagent(credentials: [JENKINS_SSH_KEY, DL_SSH_KEY]) {
echo "Publishing to git repository..."
script {
- def tagDate = sh 'date +"%Y%M%d"'
+ def wantedTag = sh (
+ script: "echo ${params.CHANNEL}/\$(date +\"%Y%m%d\")",
+ returnStdout: true
+ ).trim()
sh """
- git tag -am ${params.CHANNEL}/${tagDate} \"Jami new ${params.CHANNEL} version\"
+ git tag -am \"Jami new ${params.CHANNEL} version\" ${wantedTag}
"""
if (params.CHANNEL == 'stable') {
// Only stables releases get tarballs and a tag.
- sh 'git push --follow-tags'
+ sh "git push origin --tags"
echo "Publishing release tarball..."
sh 'rsync --verbose jami*.tar.gz ' +
"${REMOTE_HOST}:${REMOTE_BASE_DIR}" +
"/release/tarballs/"
} else {
- sh 'git push --tags'
+ sh "git push origin --tags"
}
}
}
--
GitLab