This is an automated email from the ASF dual-hosted git repository. holden pushed a commit to branch branch-2.4 in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-2.4 by this push: new bf01280 [SPARK-31860][BUILD][2.4] only push release tags on success bf01280 is described below commit bf012809eb28a7feb5f5e20788550a39e1dbe8ad Author: Holden Karau <hka...@apple.com> AuthorDate: Mon Jun 1 17:46:13 2020 -0700 [SPARK-31860][BUILD][2.4] only push release tags on success ### What changes were proposed in this pull request? Only push the release tag after the build has finished. ### Why are the changes needed? If the build fails we don't need a release tag. ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Running locally with a fake user Closes #28667 from holdenk/SPARK-31860-only-push-release-tags-on-success. Authored-by: Holden Karau <hka...@apple.com> Signed-off-by: Holden Karau <hka...@apple.com> --- dev/create-release/do-release.sh | 11 ++++++++--- dev/create-release/release-build.sh | 7 +++++-- dev/create-release/release-tag.sh | 11 ++--------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dev/create-release/do-release.sh b/dev/create-release/do-release.sh index f1d4f3a..9ff2222 100755 --- a/dev/create-release/do-release.sh +++ b/dev/create-release/do-release.sh @@ -17,6 +17,8 @@ # limitations under the License. # +set -e + SELF=$(cd $(dirname $0) && pwd) . "$SELF/release-util.sh" @@ -52,9 +54,6 @@ function should_build { if should_build "tag" && [ $SKIP_TAG = 0 ]; then run_silent "Creating release tag $RELEASE_TAG..." "tag.log" \ "$SELF/release-tag.sh" - echo "It may take some time for the tag to be synchronized to github." - echo "Press enter when you've verified that the new tag ($RELEASE_TAG) is available." - read else echo "Skipping tag creation for $RELEASE_TAG." fi @@ -79,3 +78,9 @@ if should_build "publish"; then else echo "Skipping publish step." fi + +if should_build "tag" && [ $SKIP_TAG = 0 ]; then + # Push the tag after success + git push origin "$RELEASE_TAG" + git push origin "HEAD:$GIT_BRANCH" +fi diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index 1fd8a30..3c287fd 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -92,9 +92,12 @@ BASE_DIR=$(pwd) init_java init_maven_sbt -rm -rf spark -git clone "$ASF_REPO" +# Only clone the repo fresh when not present, otherwise use checkout +if [ ! -d spark ]; then + git clone "$ASF_REPO" +fi cd spark +git fetch git checkout $GIT_REF git_hash=`git rev-parse --short HEAD` echo "Checked out Spark git hash $git_hash" diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh index 8024440..517c7f7 100755 --- a/dev/create-release/release-tag.sh +++ b/dev/create-release/release-tag.sh @@ -24,7 +24,7 @@ function exit_with_usage { local NAME=$(basename $0) cat << EOF usage: $NAME -Tags a Spark release on a particular branch. +Tags a Spark release on a particular branch. Must push after Inputs are specified with the following environment variables: ASF_USERNAME - Apache Username @@ -101,14 +101,7 @@ sed -i".tmp7" 's/SPARK_VERSION_SHORT:.*$/SPARK_VERSION_SHORT: '"$R_NEXT_VERSION" git commit -a -m "Preparing development version $NEXT_VERSION" -if ! is_dry_run; then - # Push changes - git push origin $RELEASE_TAG - git push origin HEAD:$GIT_BRANCH - - cd .. - rm -rf spark -else +if is_dry_run; then cd .. mv spark spark.tag echo "Clone with version changes and tag available as spark.tag in the output directory." --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org