This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/branch-0.6 by this push:
new 6a0d0edae fix: [branch-0.6] Fix Comet version in Spark diffs (#1405)
6a0d0edae is described below
commit 6a0d0edaea77fd040494b722ef12db314f40fdfd
Author: Andy Grove <[email protected]>
AuthorDate: Mon Feb 17 18:57:24 2025 -0700
fix: [branch-0.6] Fix Comet version in Spark diffs (#1405)
---
.github/actions/setup-spark-builder/action.yaml | 5 -----
.github/workflows/spark_sql_test.yml | 1 -
.github/workflows/spark_sql_test_ansi.yml | 1 -
dev/diffs/3.4.3.diff | 2 +-
dev/diffs/3.5.1.diff | 2 +-
dev/diffs/4.0.0-preview1.diff | 2 +-
6 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/.github/actions/setup-spark-builder/action.yaml
b/.github/actions/setup-spark-builder/action.yaml
index 1bd37d6b1..dc333e5d1 100644
--- a/.github/actions/setup-spark-builder/action.yaml
+++ b/.github/actions/setup-spark-builder/action.yaml
@@ -26,10 +26,6 @@ inputs:
description: 'The Apache Spark version (e.g., 3.4.3) to build'
required: true
default: '3.4.3'
- comet-version:
- description: 'The Comet version to use for Spark'
- required: true
- default: '0.5.0-SNAPSHOT'
runs:
using: "composite"
steps:
@@ -46,7 +42,6 @@ runs:
run: |
cd apache-spark
git apply ../dev/diffs/${{inputs.spark-version}}.diff
- ../mvnw -nsu -q versions:set-property -Dproperty=comet.version
-DnewVersion=${{inputs.comet-version}} -DgenerateBackupPoms=false
- name: Cache Maven dependencies
uses: actions/cache@v4
diff --git a/.github/workflows/spark_sql_test.yml
b/.github/workflows/spark_sql_test.yml
index 238fbb271..b325a5193 100644
--- a/.github/workflows/spark_sql_test.yml
+++ b/.github/workflows/spark_sql_test.yml
@@ -71,7 +71,6 @@ jobs:
with:
spark-version: ${{ matrix.spark-version.full }}
spark-short-version: ${{ matrix.spark-version.short }}
- comet-version: '0.6.0-SNAPSHOT' # TODO: get this from pom.xml
- name: Run Spark tests
run: |
cd apache-spark
diff --git a/.github/workflows/spark_sql_test_ansi.yml
b/.github/workflows/spark_sql_test_ansi.yml
index 14ec6366f..170c10644 100644
--- a/.github/workflows/spark_sql_test_ansi.yml
+++ b/.github/workflows/spark_sql_test_ansi.yml
@@ -69,7 +69,6 @@ jobs:
with:
spark-version: ${{ matrix.spark-version.full }}
spark-short-version: ${{ matrix.spark-version.short }}
- comet-version: '0.6.0-SNAPSHOT' # TODO: get this from pom.xml
- name: Run Spark tests
run: |
cd apache-spark
diff --git a/dev/diffs/3.4.3.diff b/dev/diffs/3.4.3.diff
index ed1dfa21c..5edd0fc5d 100644
--- a/dev/diffs/3.4.3.diff
+++ b/dev/diffs/3.4.3.diff
@@ -7,7 +7,7 @@ index d3544881af1..26ab186c65d 100644
<ivy.version>2.5.1</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>3.4</spark.version.short>
-+ <comet.version>0.5.0-SNAPSHOT</comet.version>
++ <comet.version>0.6.0</comet.version>
<!--
If you changes codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
diff --git a/dev/diffs/3.5.1.diff b/dev/diffs/3.5.1.diff
index 43e0cd522..9e25e3097 100644
--- a/dev/diffs/3.5.1.diff
+++ b/dev/diffs/3.5.1.diff
@@ -7,7 +7,7 @@ index 0f504dbee85..430ec217e59 100644
<ivy.version>2.5.1</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>3.5</spark.version.short>
-+ <comet.version>0.5.0-SNAPSHOT</comet.version>
++ <comet.version>0.6.0</comet.version>
<!--
If you changes codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
diff --git a/dev/diffs/4.0.0-preview1.diff b/dev/diffs/4.0.0-preview1.diff
index 254bff4ff..ae36ea5db 100644
--- a/dev/diffs/4.0.0-preview1.diff
+++ b/dev/diffs/4.0.0-preview1.diff
@@ -7,7 +7,7 @@ index a4b1b2c3c9f..6a532749978 100644
<ivy.version>2.5.2</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>4.0</spark.version.short>
-+ <comet.version>0.5.0-SNAPSHOT</comet.version>
++ <comet.version>0.6.0</comet.version>
<!--
If you change codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
