[spark] branch master updated: [SPARK-39718][INFRA][FOLLOWUP] Remove redundant wrap in parts of the condition

[gu...@apache.org]

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

gurwls223 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 d2461c406e7 [SPARK-39718][INFRA][FOLLOWUP] Remove redundant wrap in parts of the condition
d2461c406e7 is described below

commit d2461c406e713b58f0ff555c78294faba20adf8f
Author: Yikun Jiang <yi...@gmail.com>
AuthorDate: Fri Jul 8 21:26:33 2022 +0900

    [SPARK-39718][INFRA][FOLLOWUP] Remove redundant wrap in parts of the condition
    
    ### What changes were proposed in this pull request?
    Remove wrap in parts of the condition to infra image job avoid always execute
    
    ### Why are the changes needed?
    
    Infra image job should skip when it's not a pyspark job such as [link](https://github.com/zhengruifeng/spark/runs/7250331184)(a R only job, but infra image triggered), but redundant wrap in parts of the condition has influence on condition
    
    See also:
    [1] https://github.community/t/multiple-if-conditional-with-always-is-always-true/128840/3
    
    ### Does this PR introduce _any_ user-facing change?
    No
    
    ### How was this patch tested?
    CI passed: https://github.com/Yikun/spark/runs/7251008418?check_suite_focus=true
    
    Closes #37138 from Yikun/fix_condition.
    
    Authored-by: Yikun Jiang <yi...@gmail.com>
    Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 654f254f98e..17dbd5909f8 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -255,7 +255,7 @@ jobs:
     name: "Base image build"
     needs: precondition
     # Currently, only enable docker build from cache for `master` branch jobs
-    if: fromJson(needs.precondition.outputs.required).pyspark == 'true' && ${{ inputs.branch }} == 'master'
+    if: fromJson(needs.precondition.outputs.required).pyspark == 'true' && inputs.branch == 'master'
     runs-on: ubuntu-latest
     outputs:
       image_url: ${{ steps.infra-image-outputs.outputs.image_url }}


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