You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by wi...@apache.org on 2014/01/29 01:41:51 UTC
git commit: Update tag-release to allow patch level increments.
Updated Branches:
refs/heads/master e2ec0f9cf -> ec4472625
Update tag-release to allow patch level increments.
Testing Done:
Manual
Reviewed at https://reviews.apache.org/r/17063/
Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/ec447262
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/ec447262
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/ec447262
Branch: refs/heads/master
Commit: ec4472625c514e13550cb2d1033932b221c38d2a
Parents: e2ec0f9
Author: Brian Wickman <wi...@twopensource.com>
Authored: Tue Jan 28 16:41:25 2014 -0800
Committer: Brian Wickman <wi...@apache.org>
Committed: Tue Jan 28 16:41:25 2014 -0800
----------------------------------------------------------------------
KEYS | 37 +++++++++++++++
build-support/release/tag-release | 85 ++++++++++++++++++++++++++++------
2 files changed, 109 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ec447262/KEYS
----------------------------------------------------------------------
diff --git a/KEYS b/KEYS
index 0313277..5c9d99a 100644
--- a/KEYS
+++ b/KEYS
@@ -140,3 +140,40 @@ KAgBVjSDRQzYuf1WHa8u9ciC2jqUrtPPqqPnlVKWPvyJ9Xc4jHU4aJzybE8ulC6T
O6+c57AXNYuiznfnNnuhxhdqdWCwXHxLIGvJ8kngduzdld8+W/wioCZ6MNc=
=tkZ5
-----END PGP PUBLIC KEY BLOCK-----
+pub 2048R/0BA475EB 2014-01-28
+uid Brian Wickman (CODE SIGNING KEY) <wi...@apache.org>
+sig 3 0BA475EB 2014-01-28 Brian Wickman (CODE SIGNING KEY) <wi...@apache.org>
+sub 2048R/084E1378 2014-01-28
+sig 0BA475EB 2014-01-28 Brian Wickman (CODE SIGNING KEY) <wi...@apache.org>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+mQENBFLoN6sBCADJ0B/ulnqHv7dKw9hqQx9rvxBsbjUvYTZ4C+QhmRBX6Mo2kyK3
+46zMe10qU8X0Zu+j8nLuzXVwynV3DvxsQOu91Nw/qDrSXBV8/wlaR18rnnCeOtZI
+KR3kj5F3Z2CzKA5tLRMWyFgi5zHa5xEIZ6c33WajNjdaZn8+UoDyA4WLj9OsoeJE
+nu6GZtpjxOBRa7vDky20YuLh8MDtygC0RRTJ/JIXzJmn8Y3CmwJ9y7qELs9GWly1
+Y0SW/+V7t2iwgDkQZ0rMhQvlifHI9F9ss+bggZ0QxPE5DyS7Pgqw345MBW/KoiDK
+m7G8y0xbBop61Gi490jIDsDKF93ARl96dU0bABEBAAG0NUJyaWFuIFdpY2ttYW4g
+KENPREUgU0lHTklORyBLRVkpIDx3aWNrbWFuQGFwYWNoZS5vcmc+iQE4BBMBAgAi
+BQJS6DerAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRDjbCFNC6R163cb
+CADGfmw9tzw2HrT3RprPM/RnvPSvTX6FMvhouUF6ACczVdNuWgblFv9iY+fWM+hu
+32hGAVRs59XVA4bfLT39dgsUOf3ZCgv1nFUo/KH4TiJFqqgBzuuDHOgaLnfNfzs+
+pNgwswA/i3KQvvO6sE4tfEEBRUyJ7A20vqebHUzWbD7SxAvVaECHhfxqs3qSvFbT
+vWBWv2sB143rxU2IR9L1aOLGFY/XMkpWZdDe9cL5uuICWkVnIjvaer0JpiuFcub7
+GvKC8yiNvISS9sdBNJQqzlatiyOk0dMQYZAGIZYx9v02871DCa2h+6OoassCrGco
+OCP3sD2QBNwcwKM5UFJ36nypuQENBFLoN6sBCADI72W2wy2j9YVqtkDdrd8ot+fe
+D9F7mOdC5FIVV1ds64yjtTy6KS5Exub6ry/ZWJB2GabZ2diSzrz6HOAR4rk08aGz
+aSwLmrfBoSEn0VFg6uf2c5SfDaGfxvUMm4/IoJQHdhn3Jq1dLhsDSH3HGao4gLtm
+lLaNk1JxqChmvNOJIR/vhESzYeYpz0m6wRrKgUeKFGn4xPbbQ02LzDl4ci4uu0hr
+F27qRkwRAAYMUd66hTwg5QgSs4mXeBIiz4c47CBMq4kIX6zGPtPRhNJUH9HTGZzM
+/P1rDgQpabHcU2nFA/9XrpNir+OaZpRVRUEmk7zPNcDkNEudZjTUzWmwkw+/ABEB
+AAGJAR8EGAECAAkFAlLoN6sCGwwACgkQ42whTQukdeu9OwgAhWRygaX0KTj9yd9j
+0WTv8wgYVJTntqyv5FcmlSiox/Njnce/APzPqT74Mk7EeO6Bm/63C0BQLX6n59nF
+gHnCXfp7U8dNpuxZIUQj15Tj1NEj0WjD2OQZKxH7tWakfveLeL7ViHvD0kHbBoub
+ikQdyWKHL0PjprVsNdemVuUHJzz+Rn+6qaudsDqjaxNWZhxVIMF2em+jCtfI9Gh4
+TpdPp3kUlmzcVyb4k+O+hipC2kdAmYyp38ACS9uiT6JlTyc/zP+It3xAlB4vhiEN
+oZu3gtHd7Y8ncOZieTiskxbw0YVR/16YF5JM3N6YoWmulOoqOxQM4eB0kbtZHGoO
+xyXeXg==
+=Lu6Y
+-----END PGP PUBLIC KEY BLOCK-----
http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/ec447262/build-support/release/tag-release
----------------------------------------------------------------------
diff --git a/build-support/release/tag-release b/build-support/release/tag-release
index 90dc5da..9bb00da 100755
--- a/build-support/release/tag-release
+++ b/build-support/release/tag-release
@@ -18,6 +18,42 @@ elif [[ "`git rev-parse --show-toplevel`" != "$PWD" ]]; then
exit 1
fi
+function print_help_and_exit {
+cat <<EOF
+Aurora release tagging tool.
+
+Usage: $0 [-h] [-d|-p|-m|-M]
+
+ -h Print this help message and exit
+ -d Create a new development tag (default)
+ -p Perform patch-level release
+ -m Perform minor-level release
+ -M Perform major-level release
+EOF
+exit 0
+}
+
+increment_level="dev"
+while getopts ":phm" opt; do
+ case $opt in
+ d)
+ increment_level="dev"
+ ;;
+ p)
+ increment_level="patch"
+ ;;
+ m)
+ increment_level="minor"
+ ;;
+ M)
+ increment_level="major"
+ ;;
+ h)
+ print_help_and_exit
+ ;;
+ esac
+done
+
echo == Updating to latest master.
git pull
git fetch --tags
@@ -30,9 +66,26 @@ else
major=`echo $current_version | cut -d. -f1`
minor=`echo $current_version | cut -d. -f2`
patch=`echo $current_version | cut -d. -f3 | cut -d- -f1`
+
new_tagged_version="$major.$minor.$patch"
- new_snapshot_version="$major.$((minor + 1)).$patch-SNAPSHOT"
- release_branch_name="release-$major.$minor.x"
+
+ if [[ $increment_level == "dev" ]]; then
+ new_tagged_version="$major.$minor.$patch-dev$(date +%s)"
+ new_snapshot_version="$major.$minor.$patch-SNAPSHOT"
+ release_branch_name="devel-$new_tagged_version"
+ elif [[ $increment_level == "patch" ]]; then
+ new_snapshot_version="$major.$minor.$((patch + 1))-SNAPSHOT"
+ release_branch_name="release-$major.$minor.$((patch + 1))"
+ elif [[ $increment_level == "minor" ]]; then
+ new_snapshot_version="$major.$((minor + 1)).0-SNAPSHOT"
+ release_branch_name="release-$major.$((minor + 1)).0"
+ elif [[ $increment_level == "major" ]]; then
+ new_snapshot_version="$((major + 1)).0.0-SNAPSHOT"
+ release_branch_name="release-$major.0.0"
+ else
+ echo "Unknown release increment $increment_level"
+ exit 1
+ fi
fi
if git rev-parse $new_tagged_version >/dev/null 2>&1; then
@@ -54,21 +107,27 @@ EOF
}
trap print_rollback_instructions EXIT
-echo == Incrementing snapshot version on master.
-echo $new_snapshot_version > .auroraversion
-git add .auroraversion
-git commit -m "Incrementing snapshot version from $current_version to $new_snapshot_version."
+function increment_aurora_version {
+ if [[ $new_snapshot_version != $current_version ]]; then
+ echo == Incrementing snapshot version on master.
+ echo $new_snapshot_version > .auroraversion
+ git add .auroraversion
+ git commit -m "Incrementing snapshot version from $current_version to $new_snapshot_version."
+ fi
+
+ echo == Creating $release_branch_name branch.
+ git checkout -b $release_branch_name $current_rev
-echo == Creating $release_branch_name branch.
-git checkout -b $release_branch_name $current_rev
+ echo == Committing updated .auroraversion.
+ echo $new_tagged_version > .auroraversion
+ git add .auroraversion
+ git commit -m "aurora-$new_tagged_version release."
+}
-echo == Committing updated .auroraversion.
-echo $new_tagged_version > .auroraversion
-git add .auroraversion
-git commit -m "aurora-$new_tagged_version release."
+increment_aurora_version
echo == Creating tag $new_tagged_version.
-git tag -u `git config user.email` -s -m "aurora-$new_tagged_version release." $new_tagged_version
+git tag -u `git config user.email` -s -m "aurora-$new_tagged_version." $new_tagged_version
cat <<EOF