Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:

- name: Archive
run: |
ARCHIVE_FILE_NAME="apache-iceberg-cpp-${VERSION}-rc${RC}"
ARCHIVE_FILE_NAME="apache-iceberg-cpp-${VERSION}"
tar_gz="${ARCHIVE_FILE_NAME}.tar.gz"
echo "TAR_GZ=${tar_gz}" >> ${GITHUB_ENV}
git archive HEAD --prefix "${ARCHIVE_FILE_NAME}/" --output "${tar_gz}"
Expand Down
17 changes: 6 additions & 11 deletions dev/release/release_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@ fi

rc_hash="$(git rev-list --max-count=1 "${rc_tag}")"

id="apache-iceberg-cpp-${version}-rc${rc}"
id="apache-iceberg-cpp-${version}"
rc_id="${id}-${rc}"
tar_gz="${id}.tar.gz"

if [ "${RELEASE_SIGN}" -gt 0 ]; then
Expand All @@ -94,18 +95,18 @@ if [ "${RELEASE_SIGN}" -gt 0 ]; then
echo "Found GitHub Actions workflow with ID: ${run_id}"
gh run watch --repo "${repository}" --exit-status "${run_id}"

mkdir -p "${id}"
mkdir -p "${rc_id}"

echo "Downloading .tar.gz and .sha512 from GitHub Releases"
gh release download "${rc_tag}" \
--dir "${id}" \
--dir "${rc_id}" \
--pattern "${tar_gz}" \
--pattern "${tar_gz}.sha512" \
--repo "${repository}" \
--skip-existing

echo "Signing tar.gz"
cd "${id}"
cd "${rc_id}"
gpg --armor --output "${tar_gz}.asc" --detach-sig "${tar_gz}"
echo "Add signature to GitHub release"
gh release upload "${rc_tag}" \
Expand All @@ -117,13 +118,7 @@ fi

if [ "${RELEASE_UPLOAD}" -gt 0 ]; then
echo "Uploading to ASF dist/dev..."
# rename files to remove -rc${rc} suffix before uploading
pushd "${id}"
for fname in ./*; do
mv "${fname}" "${fname//-rc${rc}/}"
done
popd
svn import "${id}" "https://dist.apache.org/repos/dist/dev/iceberg/${id}" -m "Apache Iceberg C++ ${version} RC${rc}"
svn import "${rc_id}" "https://dist.apache.org/repos/dist/dev/iceberg/${rc_id}" -m "Apache Iceberg C++ ${version} RC${rc}"
fi

echo "Draft email for [email protected] mailing list"
Expand Down
7 changes: 4 additions & 3 deletions dev/release/verify_rc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ VERSION="$1"
RC="$2"

ICEBERG_DIST_BASE_URL="https://downloads.apache.org/iceberg"
DOWNLOAD_RC_BASE_URL="https://dist.apache.org/repos/dist/dev/iceberg/apache-iceberg-cpp-${VERSION}-rc${RC}"
ARCHIVE_BASE_NAME="apache-iceberg-cpp-${VERSION}-rc${RC}"
RC_BASE_DIR="apache-iceberg-cpp-${VERSION}-rc${RC}"
DOWNLOAD_RC_BASE_URL="https://dist.apache.org/repos/dist/dev/iceberg/${RC_BASE_DIR}"
ARCHIVE_BASE_NAME="apache-iceberg-cpp-${VERSION}"

: "${VERIFY_DEFAULT:=1}"
: "${VERIFY_DOWNLOAD:=${VERIFY_DEFAULT}}"
Expand Down Expand Up @@ -142,7 +143,7 @@ cd "${VERIFY_TMPDIR}"
import_gpg_keys
fetch_archive
ensure_source_directory
pushd "${ARCHIVE_BASE_NAME}"
pushd "${RC_BASE_DIR}"
test_source_distribution
popd

Expand Down
Loading