Skip to content

Commit 0a5fec1

Browse files
committed
Merge remote-tracking branch 'apache/main' into native-write-fallback
2 parents bd57ff2 + 6a2209d commit 0a5fec1

File tree

70 files changed

+2937
-1301
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+2937
-1301
lines changed

.github/actions/java-test/action.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,16 @@ inputs:
3737
description: 'Whether to upload test results including coverage to GitHub'
3838
required: false
3939
default: 'false'
40+
skip-native-build:
41+
description: 'Skip native build (when using pre-built artifact)'
42+
required: false
43+
default: 'false'
4044

4145
runs:
4246
using: "composite"
4347
steps:
4448
- name: Run Cargo release build
49+
if: ${{ inputs.skip-native-build != 'true' }}
4550
shell: bash
4651
# it is important that we run the Scala tests against a release build rather than a debug build
4752
# to make sure that no tests are relying on overflow checks that are present only in debug builds

.github/actions/rust-test/action.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ description: "Run Rust tests"
2121
runs:
2222
using: "composite"
2323
steps:
24-
- name: Check Cargo fmt
25-
shell: bash
26-
run: |
27-
cd native
28-
cargo fmt --all -- --check --color=never
24+
# Note: cargo fmt check is now handled by the lint job that gates this workflow
2925

3026
- name: Check Cargo clippy
3127
shell: bash

.github/actions/setup-spark-builder/action.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ inputs:
2424
spark-version:
2525
description: 'The Apache Spark version (e.g., 3.5.7) to build'
2626
required: true
27+
skip-native-build:
28+
description: 'Skip native build (when using pre-built artifact)'
29+
required: false
30+
default: 'false'
2731
runs:
2832
using: "composite"
2933
steps:
@@ -51,7 +55,15 @@ runs:
5155
restore-keys: |
5256
${{ runner.os }}-spark-sql-
5357
54-
- name: Build Comet
58+
- name: Build Comet (with native)
59+
if: ${{ inputs.skip-native-build != 'true' }}
5560
shell: bash
5661
run: |
5762
PROFILES="-Pspark-${{inputs.spark-short-version}}" make release
63+
64+
- name: Build Comet (Maven only, skip native)
65+
if: ${{ inputs.skip-native-build == 'true' }}
66+
shell: bash
67+
run: |
68+
# Native library should already be in native/target/release/
69+
./mvnw install -Prelease -DskipTests -Pspark-${{inputs.spark-short-version}}

.github/workflows/benchmark-tpcds.yml

Lines changed: 0 additions & 155 deletions
This file was deleted.

.github/workflows/benchmark-tpch.yml

Lines changed: 0 additions & 119 deletions
This file was deleted.

0 commit comments

Comments
 (0)