Repository: arrow Updated Branches: refs/heads/master e794a598b -> 32a4d70db
ARROW-936: add missing file; revert tag change Change-Id: I22603129e9b442ded0def4cd36b564de4a712fc8 Author: Julien Le Dem <[email protected]> Closes #631 from julienledem/fix_README and squashes the following commits: 13bc318 [Julien Le Dem] revert tag change 2f6b14c [Julien Le Dem] add missing file; revert tag change Project: http://git-wip-us.apache.org/repos/asf/arrow/repo Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/32a4d70d Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/32a4d70d Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/32a4d70d Branch: refs/heads/master Commit: 32a4d70db7faf196543b5701c3a5d4b527b7f947 Parents: e794a59 Author: Julien Le Dem <[email protected]> Authored: Tue May 2 15:36:55 2017 -0400 Committer: Wes McKinney <[email protected]> Committed: Tue May 2 15:36:55 2017 -0400 ---------------------------------------------------------------------- dev/release/00-prepare.sh | 7 +++---- dev/release/02-source.sh | 6 +++--- dev/release/README | 6 +++--- dev/release/setup-gpg-agent.sh | 3 +++ 4 files changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/arrow/blob/32a4d70d/dev/release/00-prepare.sh ---------------------------------------------------------------------- diff --git a/dev/release/00-prepare.sh b/dev/release/00-prepare.sh index 398f15d..c8d7909 100644 --- a/dev/release/00-prepare.sh +++ b/dev/release/00-prepare.sh @@ -21,12 +21,11 @@ set -e SOURCE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -if [ "$#" -eq 3 ]; then +if [ "$#" -eq 2 ]; then version=$1 nextVersion=$2 nextVersionSNAPSHOT=${nextVersion}-SNAPSHOT - rcnum=$3 - tag=apache-arrow-${version}-rc${rcnum} + tag=apache-arrow-${version} echo "prepare release ${version} rc ${rcnum} on tag ${tag} then reset to version ${nextVersionSNAPSHOT}" @@ -40,7 +39,7 @@ if [ "$#" -eq 3 ]; then echo "Finish staging binary artifacts by running: sh dev/release/01-perform.sh" else - echo "Usage: $0 <version> <nextVersion> <rc-num>" + echo "Usage: $0 <version> <nextVersion>" exit fi http://git-wip-us.apache.org/repos/asf/arrow/blob/32a4d70d/dev/release/02-source.sh ---------------------------------------------------------------------- diff --git a/dev/release/02-source.sh b/dev/release/02-source.sh index 3bb7204..d3d94af 100755 --- a/dev/release/02-source.sh +++ b/dev/release/02-source.sh @@ -37,12 +37,12 @@ fi tag=apache-arrow-${version} tagrc=${tag}-rc${rc} -echo "Preparing source for ${tagrc}" +echo "Preparing source for tag ${tag}" -release_hash=`git rev-list $tagrc 2> /dev/null | head -n 1 ` +release_hash=`git rev-list $tag 2> /dev/null | head -n 1 ` if [ -z "$release_hash" ]; then - echo "Cannot continue: unknown git tag: $tagrc" + echo "Cannot continue: unknown git tag: $tag" exit fi http://git-wip-us.apache.org/repos/asf/arrow/blob/32a4d70d/dev/release/README ---------------------------------------------------------------------- diff --git a/dev/release/README b/dev/release/README index 265a234..cf68028 100644 --- a/dev/release/README +++ b/dev/release/README @@ -11,10 +11,10 @@ git co -b release-0_1_0 #setup gpg agent for signing artifacts source dev/release/setup-gpg-agent.sh -# prepare release v 0.1.0 (run tests, sign artifacts). Next version will be 0.1.1-SNAPSHOT, RC 0 -sh dev/release/00-prepare.sh 0.1.0 0.1.1 0 +# prepare release v 0.1.0 (run tests, sign artifacts). Next version will be 0.1.1-SNAPSHOT +sh dev/release/00-prepare.sh 0.1.0 0.1.1 # push the tag -git push apache apache-arrow-0.1.0-rc0 +git push apache apache-arrow-0.1.0 # tag and push to maven repo (repo will have to be finalized separately) sh dev/release/01-perform.sh # create the source release http://git-wip-us.apache.org/repos/asf/arrow/blob/32a4d70d/dev/release/setup-gpg-agent.sh ---------------------------------------------------------------------- diff --git a/dev/release/setup-gpg-agent.sh b/dev/release/setup-gpg-agent.sh new file mode 100644 index 0000000..acc0809 --- /dev/null +++ b/dev/release/setup-gpg-agent.sh @@ -0,0 +1,3 @@ +# source me +eval $(gpg-agent --daemon --allow-preset-passphrase) +gpg --use-agent -s LICENSE.txt
