You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ko...@apache.org on 2022/07/20 03:30:06 UTC
[arrow] branch master updated: ARROW-16667: [CI][Release] Post merge script should not be necessary (#13593)
This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 0ebaad9105 ARROW-16667: [CI][Release] Post merge script should not be necessary (#13593)
0ebaad9105 is described below
commit 0ebaad9105e976adcb80582255c4f07fb12548dd
Author: Raúl Cumplido <ra...@gmail.com>
AuthorDate: Wed Jul 20 05:29:59 2022 +0200
ARROW-16667: [CI][Release] Post merge script should not be necessary (#13593)
With new workflow we should always use `archery release cherry-pick` instead of cherrypicking manually.
The maintenance branch should be updated with the corresponding commits for the release candidate also for patches and we should not manually merge the changes to the branch anymore.
Authored-by: Raúl Cumplido <ra...@gmail.com>
Signed-off-by: Sutou Kouhei <ko...@clear-code.com>
---
dev/release/post-01-merge.sh | 53 ----------------------
.../{post-02-upload.sh => post-01-upload.sh} | 0
.../{post-03-binary.sh => post-02-binary.sh} | 0
.../{post-04-website.sh => post-03-website.sh} | 0
dev/release/{post-05-ruby.sh => post-04-ruby.sh} | 0
dev/release/{post-06-js.sh => post-05-js.sh} | 0
.../{post-07-csharp.sh => post-06-csharp.sh} | 0
...rtifacts.sh => post-07-remove-old-artifacts.sh} | 0
dev/release/{post-09-docs.sh => post-08-docs.sh} | 0
.../{post-10-python.sh => post-09-python.sh} | 0
dev/release/{post-11-go.sh => post-10-go.sh} | 0
...sions-test.rb => post-11-bump-versions-test.rb} | 2 +-
...2-bump-versions.sh => post-11-bump-versions.sh} | 0
dev/release/{post-13-msys2.sh => post-12-msys2.sh} | 0
.../{post-14-homebrew.sh => post-13-homebrew.sh} | 0
docs/source/developers/release.rst | 10 ++--
16 files changed, 6 insertions(+), 59 deletions(-)
diff --git a/dev/release/post-01-merge.sh b/dev/release/post-01-merge.sh
deleted file mode 100755
index 4dae2c4698..0000000000
--- a/dev/release/post-01-merge.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/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.
-
-set -e
-set -u
-
-if [ "$#" -ne 2 ]; then
- echo "Usage: $0 <version> <rc-num>"
- exit
-fi
-
-version=$1
-rc=$2
-
-case ${version} in
- *.0.0) # Major release
- echo "Do nothing for major release"
- ;;
- *.*.0) # Minor release
- echo "Minor release isn't supported yet"
- exit 1
- ;;
- *) # Patch release
- echo "Fetching all commits"
- git fetch --all --prune --tags --force -j$(nproc)
-
- release_branch=release-${version}-rc${rc}
- maint_branch=maint-$(echo ${version} | sed -e 's/\.[0-9]*$/.x/')
- echo "Merging ${release_branch} to ${merge_branch}"
- git branch -D ${maint_branch}
- git checkout -b ${maint_branch} apache/${maint_branch}
- git merge release-${version}-rc${rc}
- git push apache ${maint_branch}
- git checkout -
- ;;
- *)
-esac
diff --git a/dev/release/post-02-upload.sh b/dev/release/post-01-upload.sh
similarity index 100%
rename from dev/release/post-02-upload.sh
rename to dev/release/post-01-upload.sh
diff --git a/dev/release/post-03-binary.sh b/dev/release/post-02-binary.sh
similarity index 100%
rename from dev/release/post-03-binary.sh
rename to dev/release/post-02-binary.sh
diff --git a/dev/release/post-04-website.sh b/dev/release/post-03-website.sh
similarity index 100%
rename from dev/release/post-04-website.sh
rename to dev/release/post-03-website.sh
diff --git a/dev/release/post-05-ruby.sh b/dev/release/post-04-ruby.sh
similarity index 100%
rename from dev/release/post-05-ruby.sh
rename to dev/release/post-04-ruby.sh
diff --git a/dev/release/post-06-js.sh b/dev/release/post-05-js.sh
similarity index 100%
rename from dev/release/post-06-js.sh
rename to dev/release/post-05-js.sh
diff --git a/dev/release/post-07-csharp.sh b/dev/release/post-06-csharp.sh
similarity index 100%
rename from dev/release/post-07-csharp.sh
rename to dev/release/post-06-csharp.sh
diff --git a/dev/release/post-08-remove-old-artifacts.sh b/dev/release/post-07-remove-old-artifacts.sh
similarity index 100%
rename from dev/release/post-08-remove-old-artifacts.sh
rename to dev/release/post-07-remove-old-artifacts.sh
diff --git a/dev/release/post-09-docs.sh b/dev/release/post-08-docs.sh
similarity index 100%
rename from dev/release/post-09-docs.sh
rename to dev/release/post-08-docs.sh
diff --git a/dev/release/post-10-python.sh b/dev/release/post-09-python.sh
similarity index 100%
rename from dev/release/post-10-python.sh
rename to dev/release/post-09-python.sh
diff --git a/dev/release/post-11-go.sh b/dev/release/post-10-go.sh
similarity index 100%
rename from dev/release/post-11-go.sh
rename to dev/release/post-10-go.sh
diff --git a/dev/release/post-12-bump-versions-test.rb b/dev/release/post-11-bump-versions-test.rb
similarity index 99%
rename from dev/release/post-12-bump-versions-test.rb
rename to dev/release/post-11-bump-versions-test.rb
index 730cf4f1a3..0745f692b9 100644
--- a/dev/release/post-12-bump-versions-test.rb
+++ b/dev/release/post-11-bump-versions-test.rb
@@ -50,7 +50,7 @@ class PostBumpVersionsTest < Test::Unit::TestCase
end
env = env.merge(additional_env)
sh(env,
- "dev/release/post-12-bump-versions.sh",
+ "dev/release/post-11-bump-versions.sh",
@release_version,
@next_version)
end
diff --git a/dev/release/post-12-bump-versions.sh b/dev/release/post-11-bump-versions.sh
similarity index 100%
rename from dev/release/post-12-bump-versions.sh
rename to dev/release/post-11-bump-versions.sh
diff --git a/dev/release/post-13-msys2.sh b/dev/release/post-12-msys2.sh
similarity index 100%
rename from dev/release/post-13-msys2.sh
rename to dev/release/post-12-msys2.sh
diff --git a/dev/release/post-14-homebrew.sh b/dev/release/post-13-homebrew.sh
similarity index 100%
rename from dev/release/post-14-homebrew.sh
rename to dev/release/post-13-homebrew.sh
diff --git a/docs/source/developers/release.rst b/docs/source/developers/release.rst
index 1b21542d0a..a37d02e5b7 100644
--- a/docs/source/developers/release.rst
+++ b/docs/source/developers/release.rst
@@ -290,8 +290,8 @@ Be sure to go through on the following checklist:
.. code-block::
- # dev/release/post-02-upload.sh 0.1.0 0
- dev/release/post-02-upload.sh <version> <rc>
+ # dev/release/post-01-upload.sh 0.1.0 0
+ dev/release/post-01-upload.sh <version> <rc>
.. dropdown:: Uploading binary release artifacts to Artifactory
:animate: fade-in-slide-down
@@ -302,8 +302,8 @@ Be sure to go through on the following checklist:
.. code-block::
- # dev/release/post-03-binary.sh 0.1.0 0
- dev/release/post-03-binary.sh <version> <rc number>
+ # dev/release/post-02-binary.sh 0.1.0 0
+ dev/release/post-02-binary.sh <version> <rc number>
.. dropdown:: Announcing release
:animate: fade-in-slide-down
@@ -328,7 +328,7 @@ Be sure to go through on the following checklist:
# preferred to have a cuda capable device with a recent docker version to generate the cuda docs as well
# if you don't have an nvidia GPU please ask for help on the mailing list
- dev/release/post-09-docs.sh <version>
+ dev/release/post-08-docs.sh <version>
# without a cuda device it's still possible to generate the apidocs with the following archery command
archery docker run -v "${ARROW_SITE_DIR}/docs:/build/docs" -e ARROW_DOCS_VERSION="${version}" ubuntu-docs