Skip to content

Commit

Permalink
PARQUET-1687: Update release process (#697)
Browse files Browse the repository at this point in the history
Update prepare-release.sh to create RC tags and keep using the current
RC version with SNAPSHOT for development.
Update source-release.sh to retrieve the hash of the RC tag.
Create the new script finalize-release to create the final release tag
and update the development version.
  • Loading branch information
gszadovszky committed Nov 12, 2019
1 parent d1190ab commit e60f5f1
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 7 deletions.
41 changes: 41 additions & 0 deletions dev/finalize-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/bin/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

if [ -z "$3" ]; then
cat <<EOF
Usage: $0 <release-version> <rc-num> <new-development-version-without-SNAPSHOT-suffix>
Example: $0 1.11.0 7 1.12.0
EOF
exit 1
fi

release_version="$1"
release_tag="apache-parquet-$release_version"
rc_tag="$release_tag-rc$2"
new_development_version="$3-SNAPSHOT"

git tag -am "Release Apache Parquet $release_version" "$release_tag" "$rc_tag"
mvn --batch-mode release:update-versions -DdevelopmentVersion="$new_development_version"
git commit -am 'Prepare for next development iteration'

echo
echo "Verify the release tag and the current development version then push the changes by running: git push --follow-tags"
15 changes: 10 additions & 5 deletions dev/prepare-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,23 @@

set -e

if [ -z "$2" ]; then
[[ $# != 2 ]] && err="Incorrect number of arguments: $#"
[[ -z $err ]] && ! [[ $1 =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] && err="Invalid release version: \"$1\""
[[ -z $err ]] && ! [[ $2 =~ ^[0-9]+$ ]] && err="Invalid rc number: \"$2\""

if [[ -n $err ]]; then
cat <<EOF
Usage: $0 <release-version> <new-development-version-without-SNAPSHOT-suffix>
Example: $0 1.6.0 1.7.0
$err
Usage: $0 <release-version> <rc-num>
Example: $0 1.11.0 7
EOF
exit 1
fi

release_version="$1"
new_development_version="$2-SNAPSHOT"
new_development_version="$release_version-SNAPSHOT"

tag="apache-parquet-$release_version"
tag="apache-parquet-$release_version-rc$2"

mvn release:clean
mvn release:prepare -Dtag="$tag" "-DreleaseVersion=$release_version" -DdevelopmentVersion="$new_development_version"
Expand Down
4 changes: 2 additions & 2 deletions dev/source-release.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ tagrc=${tag}-rc${rc}

echo "Preparing source for $tagrc"

release_hash=`git rev-list $tag 2> /dev/null | head -n 1 `
release_hash=`git rev-list "$tagrc" 2> /dev/null | head -n 1 `

if [ -z "$release_hash" ]; then
echo "Cannot continue: unknown git tag: $tag"
echo "Cannot continue: unknown git tag: $tagrc"
exit
fi

Expand Down

0 comments on commit e60f5f1

Please sign in to comment.