You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by lr...@apache.org on 2019/05/19 15:26:42 UTC
[bahir] 03/03: Update release script to support branches
This is an automated email from the ASF dual-hosted git repository.
lresende pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/bahir.git
commit bd237d744aa3b12a43ef09d6fd7a7088a755d068
Author: Luciano Resende <lr...@apache.org>
AuthorDate: Sun May 19 17:26:06 2019 +0200
Update release script to support branches
---
dev/release-build.sh | 41 ++++++++++++++++++++++++++++++++---------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/dev/release-build.sh b/dev/release-build.sh
index a2dc5e2..265a822 100755
--- a/dev/release-build.sh
+++ b/dev/release-build.sh
@@ -60,12 +60,14 @@ GPG_PASSPHRASE - Passphrase for GPG key used to sign release
EXAMPLES
release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT"
-release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1"
-release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --tag="v2.3.0-rc1" --gitCommitHash="a874b73" --dryRun
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --tag="v2.3.0-rc1"
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --gitBranch="branch-2.3" --tag="v2.3.0-rc1"
+release-build.sh --release-prepare --releaseVersion="2.3.0" --developmentVersion="2.4.0-SNAPSHOT" --releaseRc="rc1" --tag="v2.3.0-rc1" --gitCommitHash="a874b73" --dryRun
-release-build.sh --release-publish --gitTag="v2.3.0rc1"
+release-build.sh --release-publish --gitTag="v2.3.0-rc1"
release-build.sh --release-snapshot
+release-build.sh --release-snapshot --gitCommitHash="a874b73"
EOF
exit 1
@@ -101,6 +103,10 @@ while [ "${1+defined}" ]; do
GIT_REF="${PARTS[1]}"
shift
;;
+ --gitBranch)
+ GIT_BRANCH="${PARTS[1]}"
+ shift
+ ;;
--gitTag)
GIT_TAG="${PARTS[1]}"
shift
@@ -158,17 +164,25 @@ if [[ "$RELEASE_PREPARE" == "true" && -z "$DEVELOPMENT_VERSION" ]]; then
exit_with_usage
fi
-if [[ "$RELEASE_PUBLISH" == "true" ]]; then
- if [[ "$GIT_REF" && "$GIT_TAG" ]]; then
- echo "ERROR: Only one argumented permitted when publishing : --gitCommitHash or --gitTag"
+if [[ "$RELEASE_PREPARE" == "true" ]]; then
+ if [[ "$GIT_REF" && "$GIT_BRANCH" ]]; then
+ echo "ERROR: Only one argument permitted when publishing : --gitCommitHash or --gitBranch"
exit_with_usage
fi
- if [[ -z "$GIT_REF" && -z "$GIT_TAG" ]]; then
- echo "ERROR: --gitCommitHash OR --gitTag must be passed as an argument to run this script"
+fi
+
+if [[ "$RELEASE_PUBLISH" == "true" ]]; then
+ if [[ -z "$GIT_TAG" ]]; then
+ echo "ERROR: --gitTag must be passed as an argument to run this script"
exit_with_usage
fi
fi
+if [[ "$RELEASE_PUBLISH" == "true" && "$GIT_REF" ]]; then
+ echo "ERROR: --gitCommitHash not supported for --release-publish"
+ exit_with_usage
+fi
+
if [[ "$RELEASE_PUBLISH" == "true" && "$DRY_RUN" ]]; then
echo "ERROR: --dryRun not supported for --release-publish"
exit_with_usage
@@ -181,6 +195,9 @@ fi
# Commit ref to checkout when building
GIT_REF=${GIT_REF:-master}
+if [[ "$RELEASE_PREPARE" == "true" && "$GIT_BRANCH" ]]; then
+ GIT_REF="origin/$GIT_BRANCH"
+fi
if [[ "$RELEASE_PUBLISH" == "true" && "$GIT_TAG" ]]; then
GIT_REF="tags/$GIT_TAG"
fi
@@ -207,6 +224,7 @@ echo "------- Release preparation with the following parameters ---"
echo "-------------------------------------------------------------"
echo "Executing ==> $GOAL"
echo "Git reference ==> $GIT_REF"
+echo "Git branch ==> $GIT_BRANCH"
echo "release version ==> $RELEASE_VERSION"
echo "development version ==> $DEVELOPMENT_VERSION"
echo "rc ==> $RELEASE_RC"
@@ -227,7 +245,12 @@ function checkout_code {
rm -rf bahir
git clone https://git-wip-us.apache.org/repos/asf/bahir.git
cd bahir
- git checkout $GIT_REF
+ if [[ "$GIT_BRANCH" ]]; then
+ git checkout --track $GIT_REF
+ else
+ git checkout $GIT_REF
+ fi
+
git_hash=`git rev-parse --short HEAD`
echo "Checked out Bahir git hash $git_hash"