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

bowenliang pushed a commit to branch branch-1.8
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/branch-1.8 by this push:
     new 2bbe03603 [KYUUBI #5444] [CI] Check style with profiles of Spark 3.4 
and 3.5
2bbe03603 is described below

commit 2bbe0360347299637f39c8d8bae4c61d5abce002
Author: Bowen Liang <liangbo...@gf.com.cn>
AuthorDate: Thu Oct 19 14:31:20 2023 +0800

    [KYUUBI #5444] [CI] Check style with profiles of Spark 3.4 and 3.5
    
    ### _Why are the changes needed?_
    
    - Check style with profile of Spark 3.4 and 3.5 in the style workflow
    - Isolated scalastyle check for Spark 3.1 profile, as Iceberg 1.3.1 does 
not support Spark 3.5
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including 
negative and positive cases if possible
    
    - [ ] Add screenshots for manual tests if appropriate
    
    - [x] [Run 
test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests)
 locally before make a pull request
    
    ### _Was this patch authored or co-authored using generative AI tooling?_
    
    No.
    
    Closes #5444 from bowenliang123/spotless-spark34.
    
    Closes #5444
    
    ca98c52e6 [Bowen Liang] update
    9550a4a0a [Bowen Liang] enable spark-3.1 profile for spotless style checks
    dae35290b [Bowen Liang] revert order
    3e488cf48 [Bowen Liang] Check with Spark 3.1 profile separately
    e879f09f8 [Bowen Liang] revert the order of spark versions in profiles
    16456a7fd [Bowen Liang] check style with profile of Spark 3.4 and 3.5
    
    Authored-by: Bowen Liang <liangbo...@gf.com.cn>
    Signed-off-by: Bowen Liang <liangbo...@gf.com.cn>
    (cherry picked from commit 48bdc7d4cb9023a5de6bef2a10f3ea7512f1940d)
    Signed-off-by: Bowen Liang <liangbo...@gf.com.cn>
---
 .github/workflows/style.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/style.yml b/.github/workflows/style.yml
index 21cacbc1d..87823ddbd 100644
--- a/.github/workflows/style.yml
+++ b/.github/workflows/style.yml
@@ -34,7 +34,7 @@ jobs:
     strategy:
       matrix:
         profiles:
-          - 
'-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.3,spark-3.2,spark-3.1,tpcds,kubernetes-it'
+          - 
'-Pflink-provided,hive-provided,spark-provided,spark-block-cleaner,spark-3.5,spark-3.4,spark-3.3,spark-3.2,tpcds,kubernetes-it'
 
     steps:
       - uses: actions/checkout@v3
@@ -73,7 +73,10 @@ jobs:
 
       - name: Scalastyle with maven
         id: scalastyle-check
-        run: build/mvn scalastyle:check ${{ matrix.profiles }}
+        # Check with Spark 3.1 profile separately as it use Iceberg 1.3.1 
which is not compatible with Spark 3.5+
+        run: |
+          build/mvn scalastyle:check ${{ matrix.profiles }}        
+          build/mvn scalastyle:check 
-Pflink-provided,hive-provided,spark-provided,spark-3.1
       - name: Print scalastyle error report
         if: failure() && steps.scalastyle-check.outcome != 'success'
         run: >-
@@ -87,7 +90,7 @@ jobs:
         run: |
           SPOTLESS_BLACK_VERSION=$(build/mvn help:evaluate 
-Dexpression=spotless.python.black.version -q -DforceStdout)
           pip install black==$SPOTLESS_BLACK_VERSION
-          build/mvn spotless:check ${{ matrix.profiles }} -Pspotless-python
+          build/mvn spotless:check ${{ matrix.profiles }} 
-Pspotless-python,spark-3.1
       - name: setup npm
         uses: actions/setup-node@v3
         with:

Reply via email to