diff --git a/extras/packaging/gnu-linux/Jenkinsfile b/extras/packaging/gnu-linux/Jenkinsfile index 500556a8c1542523cb0a70345dcda7e635febc9e..08c8ac99e79e22f1c782a4efea1db77089645ab7 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" } } }