diff --git a/dev/release/release-tarball.sh b/dev/release/release-tarball.sh index 352c15a3038b..0d111392fe69 100755 --- a/dev/release/release-tarball.sh +++ b/dev/release/release-tarball.sh @@ -75,5 +75,5 @@ echo "Success!" echo "The release is available here:" echo " https://dist.apache.org/repos/dist/release/arrow/${release_version}" -echo "Clean up old versions from svn" -"${SOURCE_TOP_DIR}"/dev/release/remove-old-releases.sh +echo "Clean up old artifacts from svn" +"${SOURCE_TOP_DIR}"/dev/release/remove-old-artifacts.sh diff --git a/dev/release/remove-old-releases.sh b/dev/release/remove-old-artifacts.sh similarity index 61% rename from dev/release/remove-old-releases.sh rename to dev/release/remove-old-artifacts.sh index 0722197a84b4..06bcc2740257 100755 --- a/dev/release/remove-old-releases.sh +++ b/dev/release/remove-old-artifacts.sh @@ -18,8 +18,8 @@ # under the License. # -# This script removes all but the most recent versions of arrow-rs -# from svn +# This script removes all RCs and all but the most recent versions of +# arrow-rs from svn. # # The older versions are in SVN history as well as available on the # archive page https://archive.apache.org/dist/ @@ -29,17 +29,35 @@ set -e set -u +set -o pipefail -svn_base="https://dist.apache.org/repos/dist/release/arrow" +echo "Remove all RCs" +dev_base_url=https://dist.apache.org/repos/dist/dev/arrow +old_rcs=$( + svn ls ${dev_base_url}/ | \ + grep -E '^apache-arrow-rs-[0-9]' | \ + sort --version-sort +) +for old_rc in $old_rcs; do + echo "Remove RC: ${old_rc}" + svn \ + delete \ + -m "Remove old Apache Arrow Rust RC: ${old_rc}" \ + ${dev_base_url}/${old_rc} +done echo "Remove all but the most recent version" +release_base_url="https://dist.apache.org/repos/dist/release/arrow" old_releases=$( - svn ls ${svn_base} | \ + svn ls ${release_base_url} | \ grep -E '^arrow-rs-[0-9\.]+' | \ sort --version-sort --reverse | \ tail -n +2 ) for old_release_version in $old_releases; do - echo "Remove old release ${old_release_version}" - svn delete -m "Removing ${old_release_version}" ${svn_base}/${old_release_version} + echo "Remove old release: ${old_release_version}" + svn \ + delete \ + -m "Remove Apache Arrow Rust release: ${old_release_version}" \ + ${release_base_url}/${old_release_version} done diff --git a/object_store/dev/release/release-tarball.sh b/object_store/dev/release/release-tarball.sh index 958118639143..16b10e0226f8 100755 --- a/object_store/dev/release/release-tarball.sh +++ b/object_store/dev/release/release-tarball.sh @@ -75,5 +75,5 @@ echo "Success!" echo "The release is available here:" echo " https://dist.apache.org/repos/dist/release/arrow/${release_version}" -echo "Clean up old versions from svn" -"${SOURCE_TOP_DIR}"/dev/release/remove-old-releases.sh +echo "Clean up old artifacts from svn" +"${SOURCE_TOP_DIR}"/dev/release/remove-old-artifacts.sh diff --git a/object_store/dev/release/remove-old-releases.sh b/object_store/dev/release/remove-old-artifacts.sh similarity index 60% rename from object_store/dev/release/remove-old-releases.sh rename to object_store/dev/release/remove-old-artifacts.sh index c8bd8b748396..bbbbe0c3633a 100755 --- a/object_store/dev/release/remove-old-releases.sh +++ b/object_store/dev/release/remove-old-artifacts.sh @@ -18,8 +18,8 @@ # under the License. # -# This script removes all but the most recent versions of arrow-rs -# from svn +# This script removes all RCs and all but the most recent versions of +# object_store from svn. # # The older versions are in SVN history as well as available on the # archive page https://archive.apache.org/dist/ @@ -29,17 +29,35 @@ set -e set -u +set -o pipefail -svn_base="https://dist.apache.org/repos/dist/release/arrow" +echo "Remove all RCs" +dev_base_url=https://dist.apache.org/repos/dist/dev/arrow +old_rcs=$( + svn ls ${dev_base_url}/ | \ + grep -E '^apache-arrow-object-store-rs-[0-9]' | \ + sort --version-sort +) +for old_rc in $old_rcs; do + echo "Remove RC: ${old_rc}" + svn \ + delete \ + -m "Remove old Apache Arrow Rust Object Store RC: ${old_rc}" \ + ${dev_base_url}/${old_rc} +done echo "Remove all but the most recent version" +release_base_url="https://dist.apache.org/repos/dist/release/arrow" old_releases=$( - svn ls ${svn_base} | \ + svn ls ${release_base_url} | \ grep -E '^arrow-object-store-rs-[0-9\.]+' | \ sort --version-sort --reverse | \ tail -n +2 ) for old_release_version in $old_releases; do - echo "Remove old release ${old_release_version}" - svn delete -m "Removing ${old_release_version}" ${svn_base}/${old_release_version} + echo "Remove old release: ${old_release_version}" + svn \ + delete \ + -m "Remove Apache Arrow Rust Object Store release: ${old_release_version}" \ + ${release_base_url}/${old_release_version} done