From bc5ed3ad0b5c16fcc468ba23a00cb477a396e331 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Mon, 7 Feb 2022 15:46:54 +0100 Subject: [PATCH 1/5] ARROW-15601: [Docs][Release] Update post release script to move stable docs + keep dev docs --- dev/release/post-09-docs.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 6099248f096..472287f4e01 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -24,12 +24,13 @@ SOURCE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ARROW_DIR="${SOURCE_DIR}/../.." ARROW_SITE_DIR="${ARROW_DIR}/../arrow-site" -if [ "$#" -ne 1 ]; then - echo "Usage: $0 " +if [ "$#" -ne 2 ]; then + echo "Usage: $0 " exit 1 fi version=$1 +previous_version=$2 release_tag="apache-arrow-${version}" branch_name=release-docs-${version} @@ -43,10 +44,20 @@ git checkout -b asf-site origin/asf-site git rebase apache/asf-site git branch -D ${branch_name} || : git checkout -b ${branch_name} +# list and remove previous versioned docs versioned_paths=() for versioned_path in docs/*.0/; do versioned_paths+=(${versioned_path}) + rm -rf ${versioned_path} done +# add to list and remove dev docs +versioned_paths+=("docs/dev/") +rm -rf docs/dev/ +# copy the current stable docs to temporary directory +# (remove java reference to reduce size) +rm -rf docs/java/reference/ +cp -r docs/ docs_temp/ +# delete current stable docs and restore all previous versioned docs rm -rf docs/* git checkout "${versioned_paths[@]}" curl \ @@ -54,11 +65,14 @@ curl \ --location \ --remote-name \ https://apache.jfrog.io/artifactory/arrow/docs/${version}/docs.tar.gz +cp ../docs.tar.gz . tar xvf docs.tar.gz rm -f docs.tar.gz git checkout docs/c_glib/index.html +mv docs_temp docs/${previous_version} git add docs git commit -m "[Website] Update documentations for ${version}" +git clean -d -f -x popd : ${PUSH:=1} From bda8068bfc5c7361423cc921cc2c9ddfc9a51ef1 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Thu, 17 Feb 2022 18:18:43 +0100 Subject: [PATCH 2/5] only copy stable to previous docs for major release --- dev/release/post-09-docs.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 472287f4e01..6430397a9d4 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -34,6 +34,15 @@ previous_version=$2 release_tag="apache-arrow-${version}" branch_name=release-docs-${version} +case "${version}" in + *.0.0) + is_major_release=yes + ;; + *) + is_major_release=no + ;; +esac + pushd "${ARROW_SITE_DIR}" git fetch --all --prune --tags --force -j$(nproc) git checkout . @@ -53,10 +62,12 @@ done # add to list and remove dev docs versioned_paths+=("docs/dev/") rm -rf docs/dev/ -# copy the current stable docs to temporary directory -# (remove java reference to reduce size) -rm -rf docs/java/reference/ -cp -r docs/ docs_temp/ +if [ "$is_major_release" = true ] ; then + # copy the current stable docs to temporary directory + # (remove java reference to reduce size) + rm -rf docs/java/reference/ + cp -r docs/ docs_temp/ +fi # delete current stable docs and restore all previous versioned docs rm -rf docs/* git checkout "${versioned_paths[@]}" @@ -69,7 +80,9 @@ cp ../docs.tar.gz . tar xvf docs.tar.gz rm -f docs.tar.gz git checkout docs/c_glib/index.html -mv docs_temp docs/${previous_version} +if [ "$is_major_release" = true ] ; then + mv docs_temp docs/${previous_version} +fi git add docs git commit -m "[Website] Update documentations for ${version}" git clean -d -f -x From 2a096128fa0c6a712e55b79e16205e5a7e7bb16d Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 5 Apr 2022 14:58:03 +0200 Subject: [PATCH 3/5] Update dev/release/post-09-docs.sh Co-authored-by: Sutou Kouhei --- dev/release/post-09-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index bc0434921dc..1cc09fc6778 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -63,7 +63,7 @@ done # add to list and remove dev docs versioned_paths+=("docs/dev/") rm -rf docs/dev/ -if [ "$is_major_release" = true ] ; then +if [ "$is_major_release" = "yes" ] ; then # copy the current stable docs to temporary directory # (remove java reference to reduce size) rm -rf docs/java/reference/ From 3ab3b7f1187aa619a10b66e2ca30322d134a2f48 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 5 Apr 2022 14:58:16 +0200 Subject: [PATCH 4/5] Update dev/release/post-09-docs.sh Co-authored-by: Sutou Kouhei --- dev/release/post-09-docs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 1cc09fc6778..ddc530727de 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -81,7 +81,7 @@ cp ../docs.tar.gz . tar xvf docs.tar.gz rm -f docs.tar.gz git checkout docs/c_glib/index.html -if [ "$is_major_release" = true ] ; then +if [ "$is_major_release" = "yes" ] ; then mv docs_temp docs/${previous_version} fi git add docs From a4e8564ecfeec6266de7921bf764881122f5eb78 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Tue, 5 Apr 2022 14:59:14 +0200 Subject: [PATCH 5/5] clean-up --- dev/release/post-09-docs.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index ddc530727de..ad74dbce8d0 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -77,7 +77,6 @@ curl \ --location \ --remote-name \ https://apache.jfrog.io/artifactory/arrow/docs/${version}/docs.tar.gz -cp ../docs.tar.gz . tar xvf docs.tar.gz rm -f docs.tar.gz git checkout docs/c_glib/index.html