From 80655f9909633ede4dd21a2cbdbe6938f52e9036 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 11:48:02 -0500 Subject: [PATCH 01/14] Update post-12-bump-versions.sh to generically use the default branch of apache/arrow. --- dev/release/post-12-bump-versions.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dev/release/post-12-bump-versions.sh b/dev/release/post-12-bump-versions.sh index 5a626b3592a..a13927aa467 100755 --- a/dev/release/post-12-bump-versions.sh +++ b/dev/release/post-12-bump-versions.sh @@ -20,6 +20,7 @@ set -ue SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" if [ "$#" -ne 2 ]; then echo "Usage: $0 " @@ -27,7 +28,7 @@ if [ "$#" -ne 2 ]; then fi : ${BUMP_DEFAULT:=1} -: ${BUMP_UPDATE_LOCAL_MASTER:=${BUMP_DEFAULT}} +: ${BUMP_UPDATE_LOCAL_DEFAULT_BRANCH:=${BUMP_DEFAULT}} : ${BUMP_VERSION_POST_TAG:=${BUMP_DEFAULT}} : ${BUMP_DEB_PACKAGE_NAMES:=${BUMP_DEFAULT}} : ${BUMP_LINUX_PACKAGES:=${BUMP_DEFAULT}} @@ -40,11 +41,11 @@ version=$1 next_version=$2 next_version_snapshot="${next_version}-SNAPSHOT" -if [ ${BUMP_UPDATE_LOCAL_MASTER} -gt 0 ]; then - echo "Updating local master" +if [ ${BUMP_UPDATE_LOCAL_DEFAULT_BRANCH} -gt 0 ]; then + echo "Updating local default branch" git fetch --all --prune --tags --force -j$(nproc) - git checkout master - git rebase apache/master + git checkout ${DEFAULT_BRANCH} + git rebase apache/${DEFAULT_BRANCH} fi if [ ${BUMP_VERSION_POST_TAG} -gt 0 ]; then @@ -102,13 +103,13 @@ if [ ${BUMP_LINUX_PACKAGES} -gt 0 ]; then fi if [ ${BUMP_PUSH} -gt 0 ]; then - echo "Pushing changes to the master in apache/arrow" - git push apache master + echo "Pushing changes to the default branch in apache/arrow" + git push apache ${DEFAULT_BRANCH} fi if [ ${BUMP_TAG} -gt 0 ]; then dev_tag=apache-arrow-${next_version}.dev echo "Tagging ${dev_tag}" - git tag ${dev_tag} master + git tag ${dev_tag} ${DEFAULT_BRANCH} git push apache ${dev_tag} fi From e6195544adc8e9ca152f0215103369c63d8a8076 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 11:53:38 -0500 Subject: [PATCH 02/14] Update post-12-msys2.sh to use generically use the default branch of the msys2 repository. --- dev/release/post-13-msys2.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/release/post-13-msys2.sh b/dev/release/post-13-msys2.sh index ada637ec83c..3b002756b42 100755 --- a/dev/release/post-13-msys2.sh +++ b/dev/release/post-13-msys2.sh @@ -46,9 +46,10 @@ if ! git remote | grep -q '^upstream$'; then fi echo "Updating repository: ${repository}" +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" git fetch --all --prune --tags --force -j$(nproc) -git checkout master -git rebase upstream/master +git checkout ${DEFAULT_BRANCH} +git rebase upstream/${DEFAULT_BRANCH} branch="arrow-${version}" echo "Creating branch: ${branch}" From 5be8a1e876749e48d2c9b45e9abc9f9b5e44000d Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 11:57:31 -0500 Subject: [PATCH 03/14] Update 01-prepare.sh to generically specify the default branch rather than hardcoded 'master' --- dev/release/01-prepare.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh index b1e917390b4..50bdf30625e 100755 --- a/dev/release/01-prepare.sh +++ b/dev/release/01-prepare.sh @@ -54,11 +54,12 @@ fi if [ ${PREPARE_BRANCH} -gt 0 ]; then if [[ $(git branch -l "${release_candidate_branch}") ]]; then next_rc_number=$(($rc_number+1)) + DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" echo "Branch ${release_candidate_branch} already exists, so create a new release candidate:" - echo "1. Checkout the master branch for major releases and maint- for patch releases." + echo "1. Checkout the default branch for major releases and maint- for patch releases." echo "2. Execute the script again with bumped RC number." echo "Commands:" - echo " git checkout master" + echo " git checkout ${DEFAULT_BRANCH}" echo " dev/release/01-prepare.sh ${version} ${next_version} ${next_rc_number}" exit 1 fi From 6a69a59b04a843d142df9da319fbf756a8e0d98d Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 14:07:50 -0500 Subject: [PATCH 04/14] Update post-09-docs.sh to generically use the default branch of arrow-site --- dev/release/post-09-docs.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 6099248f096..3fabf8bd49f 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -34,9 +34,10 @@ release_tag="apache-arrow-${version}" branch_name=release-docs-${version} pushd "${ARROW_SITE_DIR}" +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" git fetch --all --prune --tags --force -j$(nproc) git checkout . -git checkout master +git checkout ${DEFAULT_BRANCH} git clean -d -f -x git branch -D asf-site || : git checkout -b asf-site origin/asf-site From 9db4fb721c8f51a178e4b0258bfd80ea9001f029 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 14:08:58 -0500 Subject: [PATCH 05/14] Update post-14-homebrew.sh to generically use the default branch for the homebrew repository. --- dev/release/post-14-homebrew.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/release/post-14-homebrew.sh b/dev/release/post-14-homebrew.sh index 7cc3ca44cf0..5cce792e96b 100755 --- a/dev/release/post-14-homebrew.sh +++ b/dev/release/post-14-homebrew.sh @@ -40,10 +40,11 @@ fi echo "Updating working copy" git fetch --all --prune --tags --force -j$(nproc) +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" branch=apache-arrow-${version} echo "Creating branch: ${branch}" git branch -D ${branch} || : -git checkout -b ${branch} origin/master +git checkout -b ${branch} origin/${DEFAULT_BRANCH} echo "Updating apache-arrow formulae" brew bump-formula-pr \ From 9e482eadb07ad0403116602fc3949e8c2fa8949f Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 14:24:26 -0500 Subject: [PATCH 06/14] Update post-05-ruby.sh to generically use the default branch of the homebrew repository. --- dev/release/post-05-ruby.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-05-ruby.sh index d1feeef44f5..958700318b6 100755 --- a/dev/release/post-05-ruby.sh +++ b/dev/release/post-05-ruby.sh @@ -32,6 +32,8 @@ version=$1 archive_name=apache-arrow-${version} tar_gz=${archive_name}.tar.gz +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" + echo "NOTE: We should release RubyGems after Homebrew and MSYS2 packages are updated!!!" echo "Checking Homebrew package..." @@ -39,7 +41,7 @@ homebrew_version=$( curl \ --fail \ --no-progress-meter \ - https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/apache-arrow-glib.rb | \ + https://raw.githubusercontent.com/Homebrew/homebrew-core/${DEFAULT_BRANCH}/Formula/apache-arrow-glib.rb | \ grep url | \ grep -o "[0-9]*\.[0-9]*\.[0-9]*" | \ head -n 1) From 91bed272bf655a39ea8bd5fec70c45be00c7acb9 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 14:39:54 -0500 Subject: [PATCH 07/14] Update post-04-website.sh to generically use the default branch of the arrow-site repository. --- dev/release/post-04-website.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/release/post-04-website.sh b/dev/release/post-04-website.sh index 772a54d8c3d..6b7108634c9 100755 --- a/dev/release/post-04-website.sh +++ b/dev/release/post-04-website.sh @@ -38,9 +38,10 @@ announce_file="${release_dir}/${version}.md" versions_yml="${ARROW_SITE_DIR}/_data/versions.yml" pushd "${ARROW_SITE_DIR}" +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" git fetch --all --prune --tags --force -j$(nproc) -git checkout master -git rebase apache/master +git checkout ${DEFAULT_BRANCH} +git rebase apache/${DEFAULT_BRANCH} git branch -D ${branch_name} || : git checkout -b ${branch_name} popd From 75884a914b97e78f5f337d2e404ef7dad56836bb Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 22 Feb 2022 14:51:00 -0500 Subject: [PATCH 08/14] Refactor definition of default branch to be defined in bash script, git-vars.sh. --- dev/release/01-prepare.sh | 2 +- dev/release/git-vars.sh | 1 + dev/release/post-04-website.sh | 2 +- dev/release/post-05-ruby.sh | 2 +- dev/release/post-09-docs.sh | 2 +- dev/release/post-12-bump-versions.sh | 2 +- dev/release/post-13-msys2.sh | 3 ++- dev/release/post-14-homebrew.sh | 2 +- 8 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 dev/release/git-vars.sh diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh index 50bdf30625e..f48e68a6350 100755 --- a/dev/release/01-prepare.sh +++ b/dev/release/01-prepare.sh @@ -54,7 +54,7 @@ fi if [ ${PREPARE_BRANCH} -gt 0 ]; then if [[ $(git branch -l "${release_candidate_branch}") ]]; then next_rc_number=$(($rc_number+1)) - DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" + source "git-vars.sh" echo "Branch ${release_candidate_branch} already exists, so create a new release candidate:" echo "1. Checkout the default branch for major releases and maint- for patch releases." echo "2. Execute the script again with bumped RC number." diff --git a/dev/release/git-vars.sh b/dev/release/git-vars.sh new file mode 100644 index 00000000000..fe526fbcf2b --- /dev/null +++ b/dev/release/git-vars.sh @@ -0,0 +1 @@ +DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" \ No newline at end of file diff --git a/dev/release/post-04-website.sh b/dev/release/post-04-website.sh index 6b7108634c9..4e70a466a5a 100755 --- a/dev/release/post-04-website.sh +++ b/dev/release/post-04-website.sh @@ -38,7 +38,7 @@ announce_file="${release_dir}/${version}.md" versions_yml="${ARROW_SITE_DIR}/_data/versions.yml" pushd "${ARROW_SITE_DIR}" -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" +source "git-vars.sh" git fetch --all --prune --tags --force -j$(nproc) git checkout ${DEFAULT_BRANCH} git rebase apache/${DEFAULT_BRANCH} diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-05-ruby.sh index 958700318b6..0f8fae416df 100755 --- a/dev/release/post-05-ruby.sh +++ b/dev/release/post-05-ruby.sh @@ -32,7 +32,7 @@ version=$1 archive_name=apache-arrow-${version} tar_gz=${archive_name}.tar.gz -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" +source "git-vars.sh" echo "NOTE: We should release RubyGems after Homebrew and MSYS2 packages are updated!!!" diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 3fabf8bd49f..224eb94c6b1 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -34,7 +34,7 @@ release_tag="apache-arrow-${version}" branch_name=release-docs-${version} pushd "${ARROW_SITE_DIR}" -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" +source "git-vars.sh" git fetch --all --prune --tags --force -j$(nproc) git checkout . git checkout ${DEFAULT_BRANCH} diff --git a/dev/release/post-12-bump-versions.sh b/dev/release/post-12-bump-versions.sh index a13927aa467..85d01574911 100755 --- a/dev/release/post-12-bump-versions.sh +++ b/dev/release/post-12-bump-versions.sh @@ -20,7 +20,7 @@ set -ue SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" +source "git-vars.sh" if [ "$#" -ne 2 ]; then echo "Usage: $0 " diff --git a/dev/release/post-13-msys2.sh b/dev/release/post-13-msys2.sh index 3b002756b42..9a18c3b4c83 100755 --- a/dev/release/post-13-msys2.sh +++ b/dev/release/post-13-msys2.sh @@ -45,8 +45,9 @@ if ! git remote | grep -q '^upstream$'; then exit 1 fi +source "git-vars.sh" + echo "Updating repository: ${repository}" -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" git fetch --all --prune --tags --force -j$(nproc) git checkout ${DEFAULT_BRANCH} git rebase upstream/${DEFAULT_BRANCH} diff --git a/dev/release/post-14-homebrew.sh b/dev/release/post-14-homebrew.sh index 5cce792e96b..f17ae9b90b7 100755 --- a/dev/release/post-14-homebrew.sh +++ b/dev/release/post-14-homebrew.sh @@ -40,7 +40,7 @@ fi echo "Updating working copy" git fetch --all --prune --tags --force -j$(nproc) -DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" +source "git-vars.sh" branch=apache-arrow-${version} echo "Creating branch: ${branch}" git branch -D ${branch} || : From 39c2610be7573cc4c2ee7586ea42dba19ba397a7 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Wed, 23 Feb 2022 01:09:02 -0500 Subject: [PATCH 09/14] Add license text to git-vars.sh --- dev/release/git-vars.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dev/release/git-vars.sh b/dev/release/git-vars.sh index fe526fbcf2b..0d942419aa5 100644 --- a/dev/release/git-vars.sh +++ b/dev/release/git-vars.sh @@ -1 +1,20 @@ +#!/usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + DEFAULT_BRANCH="$(git rev-parse --abbrev-ref origin/HEAD | sed s@origin/@@)" \ No newline at end of file From 7d79064cd1d82c1b0ac66e5f6021684e7f043f88 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Thu, 24 Feb 2022 10:55:54 -0500 Subject: [PATCH 10/14] Reference git-vars.sh using SOURCE_DIR --- dev/release/01-prepare.sh | 2 +- dev/release/post-04-website.sh | 2 +- dev/release/post-05-ruby.sh | 2 +- dev/release/post-09-docs.sh | 2 +- dev/release/post-12-bump-versions.sh | 2 +- dev/release/post-13-msys2.sh | 3 ++- dev/release/post-14-homebrew.sh | 3 ++- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dev/release/01-prepare.sh b/dev/release/01-prepare.sh index f48e68a6350..c7f40924d40 100755 --- a/dev/release/01-prepare.sh +++ b/dev/release/01-prepare.sh @@ -54,7 +54,7 @@ fi if [ ${PREPARE_BRANCH} -gt 0 ]; then if [[ $(git branch -l "${release_candidate_branch}") ]]; then next_rc_number=$(($rc_number+1)) - source "git-vars.sh" + source "${SOURCE_DIR}/git-vars.sh" echo "Branch ${release_candidate_branch} already exists, so create a new release candidate:" echo "1. Checkout the default branch for major releases and maint- for patch releases." echo "2. Execute the script again with bumped RC number." diff --git a/dev/release/post-04-website.sh b/dev/release/post-04-website.sh index 4e70a466a5a..d8a9df42493 100755 --- a/dev/release/post-04-website.sh +++ b/dev/release/post-04-website.sh @@ -38,7 +38,7 @@ announce_file="${release_dir}/${version}.md" versions_yml="${ARROW_SITE_DIR}/_data/versions.yml" pushd "${ARROW_SITE_DIR}" -source "git-vars.sh" +source "${SOURCE_DIR}/git-vars.sh" git fetch --all --prune --tags --force -j$(nproc) git checkout ${DEFAULT_BRANCH} git rebase apache/${DEFAULT_BRANCH} diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-05-ruby.sh index 0f8fae416df..6af9f583110 100755 --- a/dev/release/post-05-ruby.sh +++ b/dev/release/post-05-ruby.sh @@ -32,7 +32,7 @@ version=$1 archive_name=apache-arrow-${version} tar_gz=${archive_name}.tar.gz -source "git-vars.sh" +source "${SOURCE_DIR}/git-vars.sh" echo "NOTE: We should release RubyGems after Homebrew and MSYS2 packages are updated!!!" diff --git a/dev/release/post-09-docs.sh b/dev/release/post-09-docs.sh index 224eb94c6b1..cc0edc06ac2 100755 --- a/dev/release/post-09-docs.sh +++ b/dev/release/post-09-docs.sh @@ -34,7 +34,7 @@ release_tag="apache-arrow-${version}" branch_name=release-docs-${version} pushd "${ARROW_SITE_DIR}" -source "git-vars.sh" +source "${SOURCE_DIR}/git-vars.sh" git fetch --all --prune --tags --force -j$(nproc) git checkout . git checkout ${DEFAULT_BRANCH} diff --git a/dev/release/post-12-bump-versions.sh b/dev/release/post-12-bump-versions.sh index 85d01574911..53b3d5a7dd1 100755 --- a/dev/release/post-12-bump-versions.sh +++ b/dev/release/post-12-bump-versions.sh @@ -20,7 +20,7 @@ set -ue SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source "git-vars.sh" +source "${SOURCE_DIR}/git-vars.sh" if [ "$#" -ne 2 ]; then echo "Usage: $0 " diff --git a/dev/release/post-13-msys2.sh b/dev/release/post-13-msys2.sh index 9a18c3b4c83..55f7b3a6330 100755 --- a/dev/release/post-13-msys2.sh +++ b/dev/release/post-13-msys2.sh @@ -45,7 +45,8 @@ if ! git remote | grep -q '^upstream$'; then exit 1 fi -source "git-vars.sh" +SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +source "${SOURCE_DIR}/git-vars.sh" echo "Updating repository: ${repository}" git fetch --all --prune --tags --force -j$(nproc) diff --git a/dev/release/post-14-homebrew.sh b/dev/release/post-14-homebrew.sh index f17ae9b90b7..cc49d0a8e3d 100755 --- a/dev/release/post-14-homebrew.sh +++ b/dev/release/post-14-homebrew.sh @@ -40,7 +40,8 @@ fi echo "Updating working copy" git fetch --all --prune --tags --force -j$(nproc) -source "git-vars.sh" +SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +source "${SOURCE_DIR}/git-vars.sh" branch=apache-arrow-${version} echo "Creating branch: ${branch}" git branch -D ${branch} || : From 980d0ec418495aa67b058fb4a288852dc04a24ca Mon Sep 17 00:00:00 2001 From: lafiona Date: Tue, 1 Mar 2022 11:47:03 -0800 Subject: [PATCH 11/14] Update dev/release/post-05-ruby.sh Co-authored-by: Neal Richardson --- dev/release/post-05-ruby.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-05-ruby.sh index 6af9f583110..84372c425d7 100755 --- a/dev/release/post-05-ruby.sh +++ b/dev/release/post-05-ruby.sh @@ -41,7 +41,7 @@ homebrew_version=$( curl \ --fail \ --no-progress-meter \ - https://raw.githubusercontent.com/Homebrew/homebrew-core/${DEFAULT_BRANCH}/Formula/apache-arrow-glib.rb | \ + https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/apache-arrow-glib.rb | \ grep url | \ grep -o "[0-9]*\.[0-9]*\.[0-9]*" | \ head -n 1) From c1486a0a21cb7d719fcc61b405c05374d8ceb54e Mon Sep 17 00:00:00 2001 From: Fiona La Date: Tue, 1 Mar 2022 14:51:00 -0500 Subject: [PATCH 12/14] Do not source 'git-vars.sh', as the variable it defines, is no longer used. --- dev/release/post-05-ruby.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-05-ruby.sh index 84372c425d7..d1feeef44f5 100755 --- a/dev/release/post-05-ruby.sh +++ b/dev/release/post-05-ruby.sh @@ -32,8 +32,6 @@ version=$1 archive_name=apache-arrow-${version} tar_gz=${archive_name}.tar.gz -source "${SOURCE_DIR}/git-vars.sh" - echo "NOTE: We should release RubyGems after Homebrew and MSYS2 packages are updated!!!" echo "Checking Homebrew package..." From 7e7192b24f1ab4d2e0178c6f1759a68ed0cff8ba Mon Sep 17 00:00:00 2001 From: lafiona Date: Wed, 2 Mar 2022 08:59:33 -0800 Subject: [PATCH 13/14] Update dev/release/git-vars.sh Co-authored-by: Sutou Kouhei --- dev/release/git-vars.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/release/git-vars.sh b/dev/release/git-vars.sh index 0d942419aa5..7fe3255f0be 100644 --- a/dev/release/git-vars.sh +++ b/dev/release/git-vars.sh @@ -1,5 +1,3 @@ -#!/usr/bin/env bash -# # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information From 9b62122c1f86d066992ce74899913324be09d9e2 Mon Sep 17 00:00:00 2001 From: Fiona La Date: Wed, 2 Mar 2022 12:04:07 -0500 Subject: [PATCH 14/14] Revert changes to post-13-msys2.sh and post-14-homebrew.sh --- dev/release/post-13-msys2.sh | 7 ++----- dev/release/post-14-homebrew.sh | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dev/release/post-13-msys2.sh b/dev/release/post-13-msys2.sh index 55f7b3a6330..ada637ec83c 100755 --- a/dev/release/post-13-msys2.sh +++ b/dev/release/post-13-msys2.sh @@ -45,13 +45,10 @@ if ! git remote | grep -q '^upstream$'; then exit 1 fi -SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source "${SOURCE_DIR}/git-vars.sh" - echo "Updating repository: ${repository}" git fetch --all --prune --tags --force -j$(nproc) -git checkout ${DEFAULT_BRANCH} -git rebase upstream/${DEFAULT_BRANCH} +git checkout master +git rebase upstream/master branch="arrow-${version}" echo "Creating branch: ${branch}" diff --git a/dev/release/post-14-homebrew.sh b/dev/release/post-14-homebrew.sh index cc49d0a8e3d..7cc3ca44cf0 100755 --- a/dev/release/post-14-homebrew.sh +++ b/dev/release/post-14-homebrew.sh @@ -40,12 +40,10 @@ fi echo "Updating working copy" git fetch --all --prune --tags --force -j$(nproc) -SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -source "${SOURCE_DIR}/git-vars.sh" branch=apache-arrow-${version} echo "Creating branch: ${branch}" git branch -D ${branch} || : -git checkout -b ${branch} origin/${DEFAULT_BRANCH} +git checkout -b ${branch} origin/master echo "Updating apache-arrow formulae" brew bump-formula-pr \