Skip to content

Commit 567e33b

Browse files
committed
ARROW-2960: [Packaging] Fix verify-release-candidate for binary packages and fix release cutting script for lib64 cmake issue
Author: Phillip Cloud <cpcloud@gmail.com> Closes apache#2356 from cpcloud/ARROW-2960 and squashes the following commits: 5f92c9f <Phillip Cloud> ARROW-2960: Fix verify-release-candidate for binary packages and fix release cutting script for lib64 cmake issue
1 parent 0fc224b commit 567e33b

2 files changed

Lines changed: 22 additions & 6 deletions

File tree

dev/release/02-source.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ cpp_install_dir=${PWD}/${extract_dir}/cpp/install
7979
cd ${extract_dir}/cpp/build
8080
cmake .. \
8181
-DCMAKE_INSTALL_PREFIX=${cpp_install_dir} \
82+
-DCMAKE_INSTALL_LIBDIR=${cpp_install_dir}/lib \
8283
-DARROW_BUILD_TESTS=no
8384
make -j8
8485
make install

dev/release/verify-release-candidate.sh

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,19 @@ case $# in
4040
esac
4141

4242
set -ex
43+
set -o pipefail
4344

4445
HERE=$(cd `dirname "${BASH_SOURCE[0]:-$0}"` && pwd)
4546

4647
ARROW_DIST_URL='https://dist.apache.org/repos/dist/dev/arrow'
4748

4849
download_dist_file() {
49-
curl -f -O $ARROW_DIST_URL/$1
50+
curl \
51+
--silent \
52+
--show-error \
53+
--fail \
54+
--location \
55+
--remote-name $ARROW_DIST_URL/$1
5056
}
5157

5258
download_rc_file() {
@@ -71,18 +77,27 @@ fetch_archive() {
7177

7278
verify_binary_artifacts() {
7379
# download the binaries folder for the current RC
74-
download_rc_file binaries
80+
rcname=apache-arrow-${VERSION}-rc${RC_NUMBER}
81+
wget -P "$rcname" \
82+
--quiet \
83+
--no-host-directories \
84+
--cut-dirs=5 \
85+
--show-progress \
86+
--no-parent \
87+
--reject 'index.html*' \
88+
--recursive "$ARROW_DIST_URL/$rcname/binaries/"
7589

7690
# verify the signature and the checksums of each artifact
77-
find binaries -name '*.asc' | while read sigfile; do
91+
find $rcname/binaries -name '*.asc' | while read sigfile; do
7892
artifact=${sigfile/.asc/}
79-
gpg --verify $sigfile $artifact
93+
gpg --verify $sigfile $artifact || exit 1
8094

8195
# go into the directory because the checksum files contain only the
8296
# basename of the artifact
8397
pushd $(dirname $artifact)
84-
shasum -a 1 -c $artifact.sha1
85-
shasum -a 256 -c $artifact.sha256
98+
base_artifact=$(basename $artifact)
99+
shasum -a 1 -c $base_artifact.sha1 || exit 1
100+
shasum -a 256 -c $base_artifact.sha256 || exit 1
86101
popd
87102
done
88103
}

0 commit comments

Comments
 (0)