Skip to content

Commit 354bf83

Browse files
pan3793yaooqinn
authored andcommitted
[KYUUBI #1945] [BUILD] Remove spark-hadoop from matrix to simplify workflow
### _Why are the changes needed?_ Remove `spark-hadoop` from matrix to simplify workflow ### _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 - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request Closes #1945 from pan3793/ga. Closes #1945 3bd511e [Cheng Pan] nit 442f61b [Cheng Pan] fix af26d6f [Cheng Pan] list b1e2fc7 [Cheng Pan] fix 9f372d1 [Cheng Pan] GA: Remove spark-hadoop from matrix to simplify workflow Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Kent Yao <yao@apache.org>
1 parent 6359fd0 commit 354bf83

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

.github/workflows/master.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,27 @@ jobs:
2020
include:
2121
- java: 8
2222
spark: '3.0'
23-
spark-hadoop: '2.7'
23+
profiles: -Pspark-hadoop-2.7
2424
- java: 8
2525
spark: '3.1'
26-
spark-hadoop: '3.2'
2726
- java: 8
2827
spark: '3.2'
29-
spark-hadoop: '2.7'
30-
profiles: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.0.3 -Dspark.archive.name=spark-3.0.3-bin-hadoop2.7.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.IcebergTest'
28+
profiles: >-
29+
-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.0.3
30+
-Dspark.archive.name=spark-3.0.3-bin-hadoop2.7.tgz
31+
-Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.IcebergTest
3132
- java: 8
3233
spark: '3.2'
33-
spark-hadoop: '3.2'
34-
profiles: '-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2 -Dspark.archive.name=spark-3.1.2-bin-hadoop3.2.tgz -Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.IcebergTest'
34+
profiles: >-
35+
-Dspark.archive.mirror=https://archive.apache.org/dist/spark/spark-3.1.2
36+
-Dspark.archive.name=spark-3.1.2-bin-hadoop3.2.tgz
37+
-Dmaven.plugin.scalatest.exclude.tags=org.apache.kyuubi.tags.ExtendedSQLTest,org.apache.kyuubi.tags.DeltaTest,org.apache.kyuubi.tags.HudiTest,org.apache.kyuubi.tags.IcebergTest
3538
- java: 8
3639
spark: '3.2'
37-
spark-hadoop: '3.2'
3840
codecov: 'true'
3941
- java: 11
4042
spark: '3.2'
41-
spark-hadoop: '3.2'
42-
profiles: '-DskipTests -Pflink-provided,spark-provided'
43+
profiles: -DskipTests -Pflink-provided,spark-provided
4344

4445
env:
4546
SPARK_LOCAL_IP: localhost
@@ -79,7 +80,7 @@ jobs:
7980
- name: Build with Maven
8081
run: >-
8182
./build/mvn clean install -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -V
82-
-Pspark-${{ matrix.spark }} -Pspark-hadoop-${{ matrix.spark-hadoop }} ${{ matrix.profiles }}
83+
-Pspark-${{ matrix.spark }} ${{ matrix.profiles }}
8384
- name: Code coverage
8485
if: ${{ matrix.codecov == 'true' }}
8586
uses: codecov/codecov-action@v2

0 commit comments

Comments
 (0)