fixes bug in ordering of cmds
Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/04dd9479 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/04dd9479 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/04dd9479 Branch: refs/heads/reorder-partitioned-hash-join Commit: 04dd9479887b538d25ab45640768ad80de647fe6 Parents: 14d9a44 Author: cramja <marc.spehlm...@gmail.com> Authored: Fri Mar 3 16:20:33 2017 -0600 Committer: cramja <marc.spehlm...@gmail.com> Committed: Sun Mar 5 12:01:02 2017 -0600 ---------------------------------------------------------------------- release/release_cmds.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/04dd9479/release/release_cmds.sh ---------------------------------------------------------------------- diff --git a/release/release_cmds.sh b/release/release_cmds.sh index d23b4ef..abb7647 100755 --- a/release/release_cmds.sh +++ b/release/release_cmds.sh @@ -25,6 +25,7 @@ create_artifacts() { export RELEASE_DIR=`pwd` cd .. + export BASE_DIR=`pwd` # need the submodules to be included for the compile to work. # likely, this will be a no-op @@ -35,8 +36,8 @@ create_artifacts() { # the tag is necesary for the archiving to work correctly git tag -a rc-$VERSION -m 'release candidate $VERSION' git archive --format "tar" --prefix=$PROJECT_NAME-$VERSION/ -o $PROJECT_NAME-$VERSION.tar rc-$VERSION - git submodule foreach --recursive 'git archive --verbose --prefix=$PROJECT_NAME-$VERSION/$path/ --format tar master --output $RELEASE_DIR/submodule-$sha1.tar' - if [[ $(ls submodule-*.tar | wc -l) != 0 ]]; then + git submodule foreach --recursive 'git archive --verbose --prefix=$PROJECT_NAME-$VERSION/$path/ --format tar master --output $BASE_DIR/submodule-$sha1.tar' + if [[ $(ls | grep submodule-*.tar | wc -l) != 0 ]]; then # combine all archives into one tar tar --concatenate --file $PROJECT_NAME-$VERSION.tar submodule-*.tar # remove sub tars @@ -91,7 +92,7 @@ publish_candidate() { mkdir $RCFOLDER cd $RCFOLDER cp $BASE_DIR/$PROJECT_NAME-$VERSION.tar.gz* ./ - cd .. + cd ../.. svn add $VERSION/$RCFOLDER svn commit --username=$APACHE_USERNAME -m "Quickstep-$VERSION RC$CANDIDATE"