This is an automated email from the ASF dual-hosted git repository.

dongjoon 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 042116c  [SPARK-29666][BUILD] Fix the publish release failure under 
dry-run mode
042116c is described below

commit 042116cb594788f8b26547d412ae7b40519fc712
Author: Xingbo Jiang <xingbo.ji...@databricks.com>
AuthorDate: Wed Oct 30 14:57:51 2019 -0700

    [SPARK-29666][BUILD] Fix the publish release failure under dry-run mode
    
    `release-build.sh` fail to publish release under dry run mode with the 
following error message:
    ```
    /opt/spark-rm/release-build.sh: line 429: pushd: 
spark-repo-g4MBm/org/apache/spark: No such file or directory
    ```
    
    We need to at least run the `mvn clean install` command once to create the 
`$tmp_repo` path, but now those steps are all skipped under dry-run mode. This 
PR fixes the issue.
    
    Tested locally.
    
    Closes #26329 from jiangxb1987/dryrun.
    
    Authored-by: Xingbo Jiang <xingbo.ji...@databricks.com>
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
    (cherry picked from commit 155a67d00cb2f12aad179f6df2d992feca8e003e)
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
 dev/create-release/release-build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/create-release/release-build.sh 
b/dev/create-release/release-build.sh
index 8bcf8da..99a5928 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -424,13 +424,13 @@ if [[ "$1" == "publish-release" ]]; then
 
   $MVN -DzincPort=$ZINC_PORT -Dmaven.repo.local=$tmp_repo -DskipTests 
$SCALA_2_11_PROFILES $PUBLISH_PROFILES clean install
 
-  if ! is_dry_run && [[ $PUBLISH_SCALA_2_10 = 1 ]]; then
+  if [[ $PUBLISH_SCALA_2_10 = 1 ]]; then
     ./dev/change-scala-version.sh 2.10
     $MVN -DzincPort=$((ZINC_PORT + 1)) -Dmaven.repo.local=$tmp_repo 
-Dscala-2.10 \
       -DskipTests $PUBLISH_PROFILES $SCALA_2_10_PROFILES clean install
   fi
 
-  if ! is_dry_run && [[ $PUBLISH_SCALA_2_12 = 1 ]]; then
+  if [[ $PUBLISH_SCALA_2_12 = 1 ]]; then
     ./dev/change-scala-version.sh 2.12
     $MVN -DzincPort=$((ZINC_PORT + 2)) -Dmaven.repo.local=$tmp_repo 
-Dscala-2.12 \
       -DskipTests $PUBLISH_PROFILES $SCALA_2_12_PROFILES clean install


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to