This is an automated email from the ASF dual-hosted git repository.
fchen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-celeborn.git
The following commit(s) were added to refs/heads/main by this push:
new 7ab674393 [CELEBORN-913][FOLLOWUP] Recover SBT CI jobs skipped due to
last commit
7ab674393 is described below
commit 7ab674393bb5b23d313c9c441ac478ef44ebe98d
Author: zhouyifan279 <[email protected]>
AuthorDate: Sat Sep 9 02:12:09 2023 +0800
[CELEBORN-913][FOLLOWUP] Recover SBT CI jobs skipped due to last commit
### What changes were proposed in this pull request?
As title
### Why are the changes needed?
### Does this PR introduce _any_ user-facing change?
### How was this patch tested?
Verified SBT CI job list.
<img width="843" alt="image"
src="https://github.com/apache/incubator-celeborn/assets/88070094/2bbaf661-8f4d-4f3a-a7e4-242484fbd9a2";>
Closes #1890 from zhouyifan279/sbt-ci.
Authored-by: zhouyifan279 <[email protected]>
Signed-off-by: Fu Chen <[email protected]>
---
.github/workflows/maven.yml | 11 +++++
.github/workflows/sbt.yml | 107 ++++++++++++++++++++------------------------
2 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 5a3c0acc1..1080b615c 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -106,6 +106,17 @@ jobs:
spark: '3.1'
- java: 17
spark: '3.2'
+ # ShuffleDriverComponents#supportsReliableStorage was introduced in
3.5.0
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.0'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.1'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.2'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.3'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.4'
steps:
- uses: actions/checkout@v2
- name: Setup JDK ${{ matrix.java }}
diff --git a/.github/workflows/sbt.yml b/.github/workflows/sbt.yml
index 4803422bf..e778f70be 100644
--- a/.github/workflows/sbt.yml
+++ b/.github/workflows/sbt.yml
@@ -93,96 +93,85 @@ jobs:
strategy:
fail-fast: false
matrix:
+ spark:
+ - '3.0'
+ - '3.1'
+ - '3.2'
+ - '3.3'
+ - '3.4'
+ - '3.5'
+ java:
+ - 8
+ - 11
+ - 17
+ scala-binary:
+ - '2.12'
+ - '2.13'
shuffle-plugin-class:
- 'org.apache.spark.shuffle.sort.io.LocalDiskShuffleDataIO'
- 'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ exclude:
+ # SPARK-33772: Spark supports JDK 17 since 3.3.0
+ - java: 17
+ spark: '3.0'
+ - java: 17
+ spark: '3.1'
+ - java: 17
+ spark: '3.2'
+ # Spark supports scala 2.13 since 3.2.0
+ - scala-binary: '2.13'
+ spark: '3.0'
+ - scala-binary: '2.13'
+ spark: '3.1'
+ # ShuffleDriverComponents#supportsReliableStorage was introduced in
3.5.0
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.0'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.1'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.2'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.3'
+ - shuffle-plugin-class:
'org.apache.spark.shuffle.celeborn.CelebornShuffleDataIO'
+ spark: '3.4'
include:
# Spark 3.0
- spark: '3.0'
+ scala-binary: '2.12'
scala: '2.12.10'
- java: 8
- - spark: '3.0'
- scala: '2.12.10'
- java: 11
# Spark 3.1
- spark: '3.1'
+ scala-binary: '2.12'
scala: '2.12.10'
- java: 8
- spark: '3.1'
- scala: '2.12.10'
- java: 11
- # Spark supports scala 2.13 since 3.2.0
# Spark 3.2
- spark: '3.2'
+ scala-binary: '2.12'
scala: '2.12.15'
- java: 8
- - spark: '3.2'
- scala: '2.12.15'
- java: 11
- - spark: '3.2'
- scala: '2.13.5'
- java: 8
- spark: '3.2'
+ scala-binary: '2.13'
scala: '2.13.5'
- java: 11
- # SPARK-33772: Spark supports JDK 17 since 3.3.0
# Spark 3.3
- spark: '3.3'
+ scala-binary: '2.12'
scala: '2.12.15'
- java: 8
- - spark: '3.3'
- scala: '2.12.15'
- java: 11
- - spark: '3.3'
- scala: '2.12.15'
- java: 17
- spark: '3.3'
+ scala-binary: '2.13'
scala: '2.13.5'
- java: 8
- - spark: '3.3'
- scala: '2.13.5'
- java: 11
- - spark: '3.3'
- scala: '2.13.5'
- java: 17
# Spark 3.4
- spark: '3.4'
+ scala-binary: '2.12'
scala: '2.12.17'
- java: 8
- - spark: '3.4'
- scala: '2.12.17'
- java: 11
- - spark: '3.4'
- scala: '2.12.17'
- java: 17
- - spark: '3.4'
- scala: '2.13.5'
- java: 8
- spark: '3.4'
+ scala-binary: '2.13'
scala: '2.13.5'
- java: 11
- - spark: '3.4'
- scala: '2.13.5'
- java: 17
# Spark 3.5
- spark: '3.5'
+ scala-binary: '2.12'
scala: '2.12.18'
- java: 8
- - spark: '3.5'
- scala: '2.12.18'
- java: 11
- - spark: '3.5'
- scala: '2.12.18'
- java: 17
- - spark: '3.5'
- scala: '2.13.5'
- java: 8
- - spark: '3.5'
- scala: '2.13.5'
- java: 11
- spark: '3.5'
+ scala-binary: '2.13'
scala: '2.13.5'
- java: 17
steps:
- uses: actions/checkout@v2
- name: Setup JDK ${{ matrix.java }}
