From 8ca0bb7bdf7868bac4aca83f50db047d9bf0277c Mon Sep 17 00:00:00 2001 From: Kevin Liu Date: Wed, 13 Nov 2024 11:30:12 -0500 Subject: [PATCH] Fix verification script, `verify_rc.sh` (#199) * use `dist/release` * local changes * fix rc.yml * use downloads * fix url --- .github/workflows/rc.yml | 3 ++- dev/release/verify_rc.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 5a407d8..ff0bf9f 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -55,7 +55,7 @@ jobs: echo "RC=${rc}" >> ${GITHUB_ENV} - name: Archive run: | - id="apache-iceberg-go-${VERSION}" + id="apache-iceberg-go-${VERSION}-rc${RC}" tar_gz="${id}.tar.gz" echo "TAR_GZ=${tar_gz}" >> ${GITHUB_ENV} git archive HEAD --prefix "${id}/" --output "${tar_gz}" @@ -91,6 +91,7 @@ jobs: run: | tar_gz=$(echo apache-iceberg-go-*.tar.gz) version=${tar_gz#apache-iceberg-go-} + version=${version%-rc*} version=${version%.tar.gz} if [ "${GITHUB_REF_TYPE}" = "tag" ]; then rc="${GITHUB_REF_NAME#*-rc}" diff --git a/dev/release/verify_rc.sh b/dev/release/verify_rc.sh index 6177fe8..c653698 100755 --- a/dev/release/verify_rc.sh +++ b/dev/release/verify_rc.sh @@ -36,7 +36,7 @@ RC="$2" ICEBERG_DIST_BASE_URL="https://downloads.apache.org/iceberg" DOWNLOAD_RC_BASE_URL="https://github.com/apache/iceberg-go/releases/download/v${VERSION}-rc${RC}" -ARCHIVE_BASE_NAME="apache-iceberg-go-${VERSION}" +ARCHIVE_BASE_NAME="apache-iceberg-go-${VERSION}-rc${RC}" : "${VERIFY_DEFAULT:=1}" : "${VERIFY_DOWNLOAD:=${VERIFY_DEFAULT}}"