From b5f8a11ce174beb2f9995edc39b844255089994c Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Fri, 3 Sep 2021 19:39:04 +1200 Subject: [PATCH] CI: hardcoded package arch -> detected arch --- .ci/upload.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/upload.sh b/.ci/upload.sh index 3e8cdcf..e76a061 100644 --- a/.ci/upload.sh +++ b/.ci/upload.sh @@ -17,7 +17,7 @@ function prepare_upload_filename() { .ci/detect_os_arch_package_format "$package" > /tmp/os_arch_package_format; source /tmp/os_arch_package_format; detect_release_branch - detect_revision "$package" + detect_revision "$package" "$OS_ARCH" if [ -n "$REVISION" ]; then REVISION="_${REVISION}" fi @@ -58,10 +58,11 @@ detect_release_branch() { detect_revision() { local package="$1" + local arch="$2" if ! echo "$package" | grep -q '+'; then return fi - REVISION=$(echo "$package" | sed 's/_amd64.\+//' | sed 's/.\++//') + REVISION=$(echo "$package" | sed "s/_${arch}.\+//" | sed 's/.\++//') }