Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spark 3.5.1 has been released, bump snapshot versions and pom.xml #233

Merged
merged 4 commits into from
Mar 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/test-jvm/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ runs:
- name: Scala and Java Tests
env:
JDK_JAVA_OPTIONS: --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-exports java.base/sun.util.calendar=ALL-UNNAMED
run: mvn --batch-mode -Dspotless.check.skip test
run: mvn --batch-mode --update-snapshots -Dspotless.check.skip test
shell: bash

- name: Diff App test
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test-python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ runs:
shell: bash

- name: Install Spark Extension
run: mvn --batch-mode install -Dspotless.check.skip -DskipTests -Dmaven.test.skip=true -Dgpg.skip
run: mvn --batch-mode --update-snapshots install -Dspotless.check.skip -DskipTests -Dmaven.test.skip=true -Dgpg.skip
shell: bash

- name: Python Integration Tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- spark-compat-version: '3.5'
scala-compat-version: '2.12'
scala-version: '2.12.18'
spark-version: '3.5.0'
spark-version: '3.5.1'

- spark-compat-version: '3.2'
spark-version: '3.2.4'
Expand All @@ -52,7 +52,7 @@ jobs:
- spark-compat-version: '3.5'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-version: '3.5.0'
spark-version: '3.5.1'

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
scala-compat-version: '2.12'
scala-version: '2.12.17'
- spark-compat-version: '3.5'
spark-version: '3.5.0'
spark-version: '3.5.1'
scala-compat-version: '2.12'
scala-version: '2.12.18'

Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/build-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ jobs:
scala-version: '2.12.17'
java-compat-version: '8'
- spark-compat-version: '3.5'
spark-version: '3.5.1-SNAPSHOT'
scala-compat-version: '2.12'
scala-version: '2.12.18'
java-compat-version: '8'
- spark-compat-version: '4.0'
spark-version: '4.0.0-SNAPSHOT'
spark-version: '3.5.2-SNAPSHOT'
scala-compat-version: '2.12'
scala-version: '2.12.18'
java-compat-version: '8'
Expand All @@ -54,7 +49,7 @@ jobs:
scala-version: '2.13.8'
java-compat-version: '8'
- spark-compat-version: '3.5'
spark-version: '3.5.1-SNAPSHOT'
spark-version: '3.5.2-SNAPSHOT'
scala-compat-version: '2.13'
scala-version: '2.13.8'
java-compat-version: '8'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ jobs:
- name: Check
id: check
run: |
mvn --batch-mode spotless:check
mvn --batch-mode --update-snapshots spotless:check
shell: bash

- name: Changes
if: failure() && steps.check.outcome == 'failure'
run: |
mvn --batch-mode spotless:apply
mvn --batch-mode --update-snapshots spotless:apply
git diff
shell: bash

Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/test-jvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ jobs:
scala-version: '2.12.18'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.5'
scala-compat-version: '2.12'
scala-version: '2.12.18'
spark-patch-version: '1'
hadoop-version: '3'

- spark-compat-version: '3.2'
scala-compat-version: '2.13'
Expand Down Expand Up @@ -108,6 +113,11 @@ jobs:
scala-version: '2.13.8'
spark-patch-version: '0'
hadoop-version: '3'
- spark-compat-version: '3.5'
scala-compat-version: '2.13'
scala-version: '2.13.8'
spark-patch-version: '1'
hadoop-version: '3'

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
scala-compat-version: '2.12'
scala-version: '2.12.17'
- spark-compat-version: '3.5'
spark-version: '3.5.0'
spark-version: '3.5.1'
scala-compat-version: '2.12'
scala-version: '2.12.18'

Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/test-snapshots.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,10 @@ jobs:
scala-version: '2.12.17'
java-compat-version: '8'
- spark-compat-version: '3.5'
spark-version: '3.5.1-SNAPSHOT'
spark-version: '3.5.2-SNAPSHOT'
scala-compat-version: '2.12'
scala-version: '2.12.17'
java-compat-version: '8'
- spark-compat-version: '4.0'
spark-version: '4.0.0-SNAPSHOT'
scala-compat-version: '2.12'
scala-version: '2.12.18'
java-compat-version: '8'

- spark-compat-version: '3.2'
spark-version: '3.2.5-SNAPSHOT'
Expand All @@ -54,7 +49,7 @@ jobs:
scala-version: '2.13.8'
java-compat-version: '8'
- spark-compat-version: '3.5'
spark-version: '3.5.1-SNAPSHOT'
spark-version: '3.5.2-SNAPSHOT'
scala-compat-version: '2.13'
scala-version: '2.13.8'
java-compat-version: '8'
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<!-- keep in-sync with python/requirements-3.3_2.13.txt -->
<spark.major.version>3</spark.major.version>
<spark.minor.version>5</spark.minor.version>
<spark.patch.version>0</spark.patch.version>
<spark.patch.version>1</spark.patch.version>
<spark.compat.version>${spark.major.version}.${spark.minor.version}</spark.compat.version>
<spark.version>${spark.compat.version}.${spark.patch.version}</spark.version>
</properties>
Expand Down
Loading