From b5252a41753adbec52b48e41fac0bd9564d130cf Mon Sep 17 00:00:00 2001 From: Wez Furlong Date: Tue, 28 Nov 2023 11:55:29 -0700 Subject: [PATCH] ci: woodpecker uses a different env to indicate tagging --- assets/build-deb.sh | 2 +- assets/build-rpm.sh | 2 +- assets/upload-package.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/build-deb.sh b/assets/build-deb.sh index 4a8768a3d..7cb03200d 100755 --- a/assets/build-deb.sh +++ b/assets/build-deb.sh @@ -6,7 +6,7 @@ HERE=$(pwd) # If not specified, build the package as `kumomta-dev`. # When we're building from a tag (REF_TYPE is set to tag) we set 'DEB_NAME=kumomta' -[[ "${REF_TYPE}" == "tag" ]] && DEB_NAME=kumomta +[[ "${REF_TYPE}" == "tag" || "${CI_PIPELINE_EVENT}" == "tag" ]] && DEB_NAME=kumomta DEB_NAME=${DEB_NAME:-kumomta-dev} CONFLICTS=kumomta diff --git a/assets/build-rpm.sh b/assets/build-rpm.sh index 050bb8ab4..8b5776121 100755 --- a/assets/build-rpm.sh +++ b/assets/build-rpm.sh @@ -6,7 +6,7 @@ HERE=$(pwd) # If not specified, build the rpm as `kumomta-dev`. # When we're building from a tag (REF_TYPE is set to tag) we set 'RPM_NAME=kumomta' -[[ "${REF_TYPE}" == "tag" ]] && RPM_NAME=kumomta +[[ "${REF_TYPE}" == "tag" || "${CI_PIPELINE_EVENT}" == "tag" ]] && RPM_NAME=kumomta RPM_NAME=${RPM_NAME:-kumomta-dev} CONFLICTS=kumomta diff --git a/assets/upload-package.sh b/assets/upload-package.sh index 19a89d9cb..71d77620d 100755 --- a/assets/upload-package.sh +++ b/assets/upload-package.sh @@ -15,7 +15,7 @@ case "$REPO" in "mcr.microsoft.com/cbl-mariner/base/core:2.0") REPO="kumomta-mariner-2" ;; esac -[[ "${REF_TYPE}" == "tag" ]] && REPO="${REPO}-stable" +[[ "${REF_TYPE}" == "tag" || "${CI_PIPELINE_EVENT}" == "tag" ]] && REPO="${REPO}-stable" t=$(mktemp) trap "rm -f $t" EXIT