You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ho...@apache.org on 2020/06/02 18:04:43 UTC
[spark] branch master updated: [SPARK-31860][BUILD] only push
release tags on succes
This is an automated email from the ASF dual-hosted git repository.
holden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 69ba9b6 [SPARK-31860][BUILD] only push release tags on succes
69ba9b6 is described below
commit 69ba9b662e2ace592380e3cc5de041031dec2254
Author: Holden Karau <hk...@apple.com>
AuthorDate: Tue Jun 2 11:04:07 2020 -0700
[SPARK-31860][BUILD] only push release tags on succes
### 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 in https://github.com/apache/spark/pull/28667
Closes #28700 from holdenk/SPARK-31860-build-master-only-push-tags-on-success.
Authored-by: Holden Karau <hk...@apple.com>
Signed-off-by: Holden Karau <hk...@apple.com>
---
dev/create-release/do-release.sh | 14 +++++++++++---
dev/create-release/release-build.sh | 7 +++++--
dev/create-release/release-tag.sh | 16 +++-------------
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/dev/create-release/do-release.sh b/dev/create-release/do-release.sh
index 4f18a55..64fba8a 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,12 @@ if should_build "publish"; then
else
echo "Skipping publish step."
fi
+
+if should_build "tag" && [ $SKIP_TAG = 0 ]; then
+ git push origin $RELEASE_TAG
+ if [[ $RELEASE_TAG != *"preview"* ]]; then
+ git push origin HEAD:$GIT_BRANCH
+ else
+ echo "It's preview release. We only push $RELEASE_TAG to remote."
+ fi
+fi
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index e3bcb72..66c5184 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 repo fresh if not present, otherwise use checkout from the tag step
+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 39856a9..e37aa27 100755
--- a/dev/create-release/release-tag.sh
+++ b/dev/create-release/release-tag.sh
@@ -25,6 +25,7 @@ function exit_with_usage {
cat << EOF
usage: $NAME
Tags a Spark release on a particular branch.
+You must push the tags after.
Inputs are specified with the following environment variables:
ASF_USERNAME - Apache Username
@@ -105,19 +106,8 @@ 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
- if [[ $RELEASE_VERSION != *"preview"* ]]; then
- git push origin HEAD:$GIT_BRANCH
- else
- echo "It's preview release. We only push $RELEASE_TAG to remote."
- fi
-
- cd ..
- rm -rf spark
-else
- cd ..
+cd ..
+if is_dry_run; then
mv spark spark.tag
echo "Clone with version changes and tag available as spark.tag in the output directory."
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org