From 003b6be69110a198c1b9665cf101a4f62ba7c501 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 20 Feb 2023 19:26:16 -0500 Subject: [PATCH] packaging: Simplify 'Publish release artifacts stage' logic. * extras/packaging/gnu-linux/Jenkinsfile (Publish release artifacts'): Simplify logic. Change-Id: I4cec0b8009256501d627453df26bd17024e55f45 --- extras/packaging/gnu-linux/Jenkinsfile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/extras/packaging/gnu-linux/Jenkinsfile b/extras/packaging/gnu-linux/Jenkinsfile index d9ccdd23..efe2a998 100644 --- a/extras/packaging/gnu-linux/Jenkinsfile +++ b/extras/packaging/gnu-linux/Jenkinsfile @@ -149,18 +149,16 @@ make -f ${PACKAGING_DIR}/Makefile portable-release-tarball .tarball-version " ${params.CHANNEL}", returnStdout: true ).trim() - sh """ - git tag -am \"Jami new ${params.CHANNEL} version\" ${wantedTag} - """ + sh "git tag -am \"Jami new ${params.CHANNEL} version\"" + + " ${wantedTag}" + sh "git push origin --tags" if (params.CHANNEL == 'stable') { - // Only stables releases get tarballs and a tag. - sh "git push origin --tags" + // Only stable releases get a source + // tarball. echo "Publishing release tarball..." sh 'rsync --verbose jami*.tar.gz ' + "${REMOTE_HOST}:${REMOTE_BASE_DIR}" + "/release/tarballs/" - } else { - sh "git push origin --tags" } } }