You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by gu...@apache.org on 2025/05/23 05:41:14 UTC
(spark) branch branch-3.5 updated (5f3d97e9e057 -> 7c8c5b7b9615)
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a change to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
from 5f3d97e9e057 [SPARK-52276][BUILD] Make ANSWER not to be overwritten in release scripts
new 4c7472b8a015 Revert "[SPARK-52276][BUILD] Make ANSWER not to be overwritten in release scripts"
new 7c8c5b7b9615 Revert "[SPARK-52225][BUILD][FOLLOW-UP] Change -it to -ti in Docker execution in release script"
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev/create-release/do-release-docker.sh | 18 +++++++-----------
dev/create-release/release-util.sh | 19 ++++++++-----------
2 files changed, 15 insertions(+), 22 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
(spark) 02/02: Revert "[SPARK-52225][BUILD][FOLLOW-UP] Change -it to -ti in Docker execution in release script"
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
commit 7c8c5b7b9615aaa5691c845b043ceb4175516e72
Author: Hyukjin Kwon <gu...@apache.org>
AuthorDate: Fri May 23 14:41:00 2025 +0900
Revert "[SPARK-52225][BUILD][FOLLOW-UP] Change -it to -ti in Docker execution in release script"
This reverts commit ef44dbd08cb05ca2fe5fd636eb02f1211d85eeb3.
---
dev/create-release/do-release-docker.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev/create-release/do-release-docker.sh b/dev/create-release/do-release-docker.sh
index d3292d1dcb19..b175dfc44637 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -163,7 +163,7 @@ if [ -n "$JAVA" ]; then
fi
echo "Building $RELEASE_TAG; output will be at $WORKDIR/output"
-docker $([ -z "$GITHUB_ACTIONS" ] && echo "-ti") run \
+docker $([ -z "$GITHUB_ACTIONS" ] && echo "-it") run \
--env-file "$ENVFILE" \
--volume "$WORKDIR:/opt/spark-rm" \
$JAVA_VOL \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
(spark) 01/02: Revert "[SPARK-52276][BUILD] Make ANSWER not to be overwritten in release scripts"
Posted by gu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gurwls223 pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
commit 4c7472b8a015b55b1556c3959e7225c8e74a9610
Author: Hyukjin Kwon <gu...@apache.org>
AuthorDate: Fri May 23 14:40:55 2025 +0900
Revert "[SPARK-52276][BUILD] Make ANSWER not to be overwritten in release scripts"
This reverts commit 5f3d97e9e0579a2e28dff1bb4986c636adcc0004.
---
dev/create-release/do-release-docker.sh | 18 +++++++-----------
dev/create-release/release-util.sh | 19 ++++++++-----------
2 files changed, 15 insertions(+), 22 deletions(-)
diff --git a/dev/create-release/do-release-docker.sh b/dev/create-release/do-release-docker.sh
index 16aa857a3e8a..d3292d1dcb19 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -72,11 +72,9 @@ fi
if [ -d "$WORKDIR/output" ]; then
if [ -z "$ANSWER" ]; then
- read -p "Output directory already exists. Overwrite and continue? [y/n] " userinput
- if [ "$userinput" != "y" ]; then
- error "Exiting."
- fi
- elif [ "$ANSWER" != "y" ]; then
+ read -p "Output directory already exists. Overwrite and continue? [y/n] " ANSWER
+ fi
+ if [ "$ANSWER" != "y" ]; then
error "Exiting."
fi
fi
@@ -84,11 +82,9 @@ fi
if [ ! -z "$RELEASE_STEP" ] && [ "$RELEASE_STEP" = "finalize" ]; then
echo "THIS STEP IS IRREVERSIBLE! Make sure the vote has passed and you pick the right RC to finalize."
if [ -z "$ANSWER" ]; then
- read -p "You must be a PMC member to run this step. Continue? [y/n] " userinput
- if [ "$userinput" != "y" ]; then
- error "Exiting."
- fi
- elif [ "$ANSWER" != "y" ]; then
+ read -p "You must be a PMC member to run this step. Continue? [y/n] " ANSWER
+ fi
+ if [ "$ANSWER" != "y" ]; then
error "Exiting."
fi
@@ -167,7 +163,7 @@ if [ -n "$JAVA" ]; then
fi
echo "Building $RELEASE_TAG; output will be at $WORKDIR/output"
-docker run $([ -z "$GITHUB_ACTIONS" ] && echo "-ti") \
+docker $([ -z "$GITHUB_ACTIONS" ] && echo "-ti") run \
--env-file "$ENVFILE" \
--volume "$WORKDIR:/opt/spark-rm" \
$JAVA_VOL \
diff --git a/dev/create-release/release-util.sh b/dev/create-release/release-util.sh
index 687ccab7e1ca..531e353fe951 100755
--- a/dev/create-release/release-util.sh
+++ b/dev/create-release/release-util.sh
@@ -147,11 +147,9 @@ function get_release_info {
SKIP_TAG="${SKIP_TAG:-0}"
if check_for_tag "$RELEASE_TAG" && [[ $SKIP_TAG = 0 ]]; then
if [ -z "$ANSWER" ]; then
- read -p "$RELEASE_TAG already exists. Continue anyway [y/n]? " userinput
- if [ "$userinput" != "y" ]; then
- error "Exiting."
- fi
- elif [ "$ANSWER" != "y" ]; then
+ read -p "$RELEASE_TAG already exists. Continue anyway [y/n]? " ANSWER
+ fi
+ if [ "$ANSWER" != "y" ]; then
error "Exiting."
fi
SKIP_TAG=1
@@ -200,12 +198,11 @@ E-MAIL: $GIT_EMAIL
EOF
if [ -z "$ANSWER" ]; then
- read -p "Is this info correct [y/n]? " userinput
- if [ "$userinput" != "y" ]; then
- error "Exiting."
- fi
- elif [ "$ANSWER" != "y" ]; then
- error "Exiting."
+ read -p "Is this info correct [y/n]? " ANSWER
+ fi
+ if [ "$ANSWER" != "y" ]; then
+ echo "Exiting."
+ exit 1
fi
if ! is_dry_run; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org