From f52a81dd87a1415f26ee411e7f44989411cb710e Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 12:21:48 -0600
Subject: [PATCH 01/11] move macos workflows to separate file

---
 .github/workflows/pr_build.yml       | 142 ---------------------
 .github/workflows/pr_build_macos.yml | 183 +++++++++++++++++++++++++++
 2 files changed, 183 insertions(+), 142 deletions(-)
 create mode 100644 .github/workflows/pr_build_macos.yml

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
index 308dd2d68c..71e64cbf41 100644
--- a/.github/workflows/pr_build.yml
+++ b/.github/workflows/pr_build.yml
@@ -173,145 +173,3 @@ jobs:
         uses: ./.github/actions/java-test
         with:
           maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-
-  macos-test:
-    strategy:
-      matrix:
-        os: [macos-13]
-        java_version: [11, 17]
-        test-target: [rust, java]
-        spark-version: ['3.4', '3.5']
-        scala-version: ['2.12', '2.13']
-      fail-fast: false
-    if: github.event_name == 'push'
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-
-  macos-aarch64-test:
-    strategy:
-      matrix:
-        java_version: [11, 17]
-        test-target: [rust, java]
-        spark-version: ['3.4', '3.5']
-        scala-version: ['2.12', '2.13']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-        exclude: # exclude java 11 for pull_request event
-          - java_version: 11
-            is_push_event: false
-      fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-          jdk-architecture: aarch64
-          protoc-architecture: aarch_64
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-
-  macos-test-with-spark4_0:
-    strategy:
-      matrix:
-        os: [macos-13]
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['4.0']
-      fail-fast: false
-    if: github.event_name == 'push'
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }}
-          upload-test-reports: true
-
-  macos-aarch64-test-with-spark4_0:
-    strategy:
-      matrix:
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['4.0']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-        exclude: # exclude java 11 for pull_request event
-          - java_version: 11
-            is_push_event: false
-      fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-          jdk-architecture: aarch64
-          protoc-architecture: aarch_64
-      - name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }}
-          upload-test-reports: true
-
-  macos-aarch64-test-with-old-spark:
-    strategy:
-      matrix:
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['3.4']
-        scala-version: ['2.12', '2.13']
-        exclude:
-          - java_version: 8
-      fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-          jdk-architecture: aarch64
-          protoc-architecture: aarch_64
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-
diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
new file mode 100644
index 0000000000..fb1546be38
--- /dev/null
+++ b/.github/workflows/pr_build_macos.yml
@@ -0,0 +1,183 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: PR Build
+
+concurrency:
+  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
+  cancel-in-progress: true
+
+on:
+  push:
+    paths-ignore:
+      - "doc/**"
+      - "docs/**"
+      - "**.md"
+  pull_request:
+    paths-ignore:
+      - "doc/**"
+      - "docs/**"
+      - "**.md"
+  # manual trigger
+  # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
+  workflow_dispatch:
+
+env:
+  RUST_VERSION: stable
+
+jobs:
+
+  macos-test:
+    strategy:
+      matrix:
+        os: [macos-13]
+        java_version: [11, 17]
+        test-target: [rust, java]
+        spark-version: ['3.4', '3.5']
+        scala-version: ['2.12', '2.13']
+      fail-fast: false
+    if: github.event_name == 'push'
+    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-macos-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+      - if: matrix.test-target == 'rust'
+        name: Rust test steps
+        uses: ./.github/actions/rust-test
+      - if: matrix.test-target == 'java'
+        name: Java test steps
+        uses: ./.github/actions/java-test
+        with:
+          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
+
+  macos-aarch64-test:
+    strategy:
+      matrix:
+        java_version: [11, 17]
+        test-target: [rust, java]
+        spark-version: ['3.4', '3.5']
+        scala-version: ['2.12', '2.13']
+        is_push_event:
+          - ${{ github.event_name == 'push' }}
+        exclude: # exclude java 11 for pull_request event
+          - java_version: 11
+            is_push_event: false
+      fail-fast: false
+    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-macos-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+          jdk-architecture: aarch64
+          protoc-architecture: aarch_64
+      - if: matrix.test-target == 'rust'
+        name: Rust test steps
+        uses: ./.github/actions/rust-test
+      - if: matrix.test-target == 'java'
+        name: Java test steps
+        uses: ./.github/actions/java-test
+        with:
+          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
+
+  macos-test-with-spark4_0:
+    strategy:
+      matrix:
+        os: [macos-13]
+        java_version: [17]
+        test-target: [java]
+        spark-version: ['4.0']
+      fail-fast: false
+    if: github.event_name == 'push'
+    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-macos-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+      - name: Java test steps
+        uses: ./.github/actions/java-test
+        with:
+          maven_opts: -Pspark-${{ matrix.spark-version }}
+          upload-test-reports: true
+
+  macos-aarch64-test-with-spark4_0:
+    strategy:
+      matrix:
+        java_version: [17]
+        test-target: [java]
+        spark-version: ['4.0']
+        is_push_event:
+          - ${{ github.event_name == 'push' }}
+        exclude: # exclude java 11 for pull_request event
+          - java_version: 11
+            is_push_event: false
+      fail-fast: false
+    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-macos-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+          jdk-architecture: aarch64
+          protoc-architecture: aarch_64
+      - name: Java test steps
+        uses: ./.github/actions/java-test
+        with:
+          maven_opts: -Pspark-${{ matrix.spark-version }}
+          upload-test-reports: true
+
+  macos-aarch64-test-with-old-spark:
+    strategy:
+      matrix:
+        java_version: [17]
+        test-target: [java]
+        spark-version: ['3.4']
+        scala-version: ['2.12', '2.13']
+        exclude:
+          - java_version: 8
+      fail-fast: false
+    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-macos-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+          jdk-architecture: aarch64
+          protoc-architecture: aarch_64
+      - if: matrix.test-target == 'java'
+        name: Java test steps
+        uses: ./.github/actions/java-test
+        with:
+          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}

From 9ddb8b74f19d4d5b163015e0078cb71845842c63 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 12:28:21 -0600
Subject: [PATCH 02/11] simplify

---
 .github/workflows/pr_build_macos.yml | 110 ++++-----------------------
 1 file changed, 13 insertions(+), 97 deletions(-)

diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index fb1546be38..ce8e5fa381 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: PR Build
+name: PR Build (macOS)
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -41,17 +41,17 @@ env:
 
 jobs:
 
-  macos-test:
+  # test a single Spark version on Intel, and not on PRs
+  macos-x86-test:
     strategy:
       matrix:
         os: [macos-13]
-        java_version: [11, 17]
-        test-target: [rust, java]
-        spark-version: ['3.4', '3.5']
-        scala-version: ['2.12', '2.13']
+        java_version: [11]
+        spark-version: ['3.5']
+        scala-version: ['2.12']
       fail-fast: false
     if: github.event_name == 'push'
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
+    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -69,76 +69,20 @@ jobs:
         with:
           maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
 
-  macos-aarch64-test:
-    strategy:
-      matrix:
-        java_version: [11, 17]
-        test-target: [rust, java]
-        spark-version: ['3.4', '3.5']
-        scala-version: ['2.12', '2.13']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-        exclude: # exclude java 11 for pull_request event
-          - java_version: 11
-            is_push_event: false
-      fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-          jdk-architecture: aarch64
-          protoc-architecture: aarch_64
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
 
-  macos-test-with-spark4_0:
-    strategy:
-      matrix:
-        os: [macos-13]
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['4.0']
-      fail-fast: false
-    if: github.event_name == 'push'
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }}
-          upload-test-reports: true
-
-  macos-aarch64-test-with-spark4_0:
+  macos-aarch64-test:
     strategy:
       matrix:
         java_version: [17]
-        test-target: [java]
-        spark-version: ['4.0']
+        spark-version: ['3.4', '3.5', '4.0']
+        scala-version: ['2.13']
         is_push_event:
           - ${{ github.event_name == 'push' }}
-        exclude: # exclude java 11 for pull_request event
+        exclude:
           - java_version: 11
             is_push_event: false
       fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }}
+    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
@@ -152,32 +96,4 @@ jobs:
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
-          maven_opts: -Pspark-${{ matrix.spark-version }}
-          upload-test-reports: true
-
-  macos-aarch64-test-with-old-spark:
-    strategy:
-      matrix:
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['3.4']
-        scala-version: ['2.12', '2.13']
-        exclude:
-          - java_version: 8
-      fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: macos-14
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-          jdk-architecture: aarch64
-          protoc-architecture: aarch_64
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
+          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
\ No newline at end of file

From 689fad83636c24ac5efe57b96a96a25aeffb5929 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 12:38:43 -0600
Subject: [PATCH 03/11] Save

---
 .github/workflows/pr_build.yml                | 175 ------------------
 ...ld_linux_spark4.yml => pr_build_linux.yml} | 111 +++++++++--
 2 files changed, 99 insertions(+), 187 deletions(-)
 delete mode 100644 .github/workflows/pr_build.yml
 rename .github/workflows/{pr_build_linux_spark4.yml => pr_build_linux.yml} (54%)

diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml
deleted file mode 100644
index 71e64cbf41..0000000000
--- a/.github/workflows/pr_build.yml
+++ /dev/null
@@ -1,175 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-name: PR Build
-
-concurrency:
-  group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
-  cancel-in-progress: true
-
-on:
-  push:
-    paths-ignore:
-      - "doc/**"
-      - "docs/**"
-      - "**.md"
-  pull_request:
-    paths-ignore:
-      - "doc/**"
-      - "docs/**"
-      - "**.md"
-  # manual trigger
-  # https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
-  workflow_dispatch:
-
-env:
-  RUST_VERSION: stable
-
-jobs:
-
-  # run Comet test with full matrix of Java and Scala versions for the latest supported 3.5.x release
-  linux-test:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java_version: [11, 17]
-        test-target: [rust, java]
-        spark-version: ['3.5']
-        scala-version: ['2.12', '2.13']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-        exclude: # exclude java 11 for pull_request event
-          - java_version: 11
-            is_push_event: false
-      fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    container:
-      image: amd64/rust
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-          # upload test reports only for java 17
-          upload-test-reports: ${{ matrix.java_version == '17' }}
-
-  # run Comet tests for older 3.5.x releases with one java and scala versions
-  linux-test-35-minor-versions:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['3.5']
-        spark-patch-version: ['3.5.2', '3.5.3', '3.5.4']
-        scala-version: ['2.12']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-      fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-patch-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    container:
-      image: amd64/rust
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: "-Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-patch-version }}"
-          # upload test reports only for java 17
-          upload-test-reports: ${{ matrix.java_version == '17' }}
-
-  linux-test-native-datafusion-scan:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        scan_impl: ['native_datafusion', 'native_iceberg_compat']
-        java_version: [17]
-        test-target: [rust, java]
-        spark-version: ['3.5']
-        scala-version: ['2.12']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-      fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}-${{ matrix.scan_impl }}
-    runs-on: ${{ matrix.os }}
-    env:
-      COMET_PARQUET_SCAN_IMPL: ${{ matrix.scan_impl }}
-    container:
-      image: amd64/rust
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-          # upload test reports only for java 17
-          upload-test-reports: ${{ matrix.java_version == '17' }}
-
-  linux-test-with-old-spark:
-    strategy:
-      matrix:
-        os: [ubuntu-latest]
-        java_version: [11, 17]
-        test-target: [java]
-        spark-version: ['3.4']
-        scala-version: ['2.12', '2.13']
-      fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}/${{ matrix.test-target }}
-    runs-on: ${{ matrix.os }}
-    container:
-      image: amd64/rust
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
diff --git a/.github/workflows/pr_build_linux_spark4.yml b/.github/workflows/pr_build_linux.yml
similarity index 54%
rename from .github/workflows/pr_build_linux_spark4.yml
rename to .github/workflows/pr_build_linux.yml
index 0c143eb53d..7f9e9c78ba 100644
--- a/.github/workflows/pr_build_linux_spark4.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -15,14 +15,13 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: PR Build (Linux + Spark 4)
+name: PR Build
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
   cancel-in-progress: true
 
 on:
-
   push:
     paths-ignore:
       - "doc/**"
@@ -41,15 +40,40 @@ env:
   RUST_VERSION: stable
 
 jobs:
-
-  linux-test-with-spark4_0:
+  
+  # Run Rust tests once per JDK version
+  linux-test-rust:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java_version: [17]
-        test-target: [java]
-        spark-version: ['4.0']
-        suites:
+        java_version: [11, 17]
+      fail-fast: false
+    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-rust
+    runs-on: ${{ matrix.os }}
+    container:
+      image: amd64/rust
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Rust & Java toolchain
+        uses: ./.github/actions/setup-builder
+        with:
+          rust-version: ${{env.RUST_VERSION}}
+          jdk-version: ${{ matrix.java_version }}
+      - name: Rust test steps
+        uses: ./.github/actions/rust-test
+  
+  linux-test:
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        profile:
+          - name: "Spark 3.5, JDK 17, Scala 2.12"
+            java-version: "17"
+            maven_opts: "-Pspark-3.5 -Pscala-2.12"
+          - name: "Spark 4.0, JDK 17"
+            java-version: "17"
+            maven_opts: "-Pspark-4.0"
+        suite:
           - name: "fuzz"
             value: |
               org.apache.comet.CometFuzzTestSuite
@@ -95,7 +119,7 @@ jobs:
               org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
               org.apache.spark.sql.comet.CometTaskMetricsSuite
       fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}/${{ matrix.test-target }} [${{ matrix.suites.name }}]
+    name: ${{ matrix.os }}/java ${{ matrix.profile.name }} [${{ matrix.suite.name }}]
     runs-on: ${{ matrix.os }}
     container:
       image: amd64/rust
@@ -105,10 +129,73 @@ jobs:
         uses: ./.github/actions/setup-builder
         with:
           rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
+          jdk-version: ${{ matrix.profile.java_version }}
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
-          suites: ${{ matrix.suites.value }}
-          maven_opts: "-Pspark-${{ matrix.spark-version }}"
+          suite: ${{ matrix.suite.value }}
+          maven_opts: ${{ profile.maven_opts }}
           upload-test-reports: true
+
+
+# TODO
+
+  # run Comet tests for older 3.5.x releases with one java and scala versions
+#  linux-test-35-minor-versions:
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest]
+#        java_version: [17]
+#        spark-version: ['3.5']
+#        spark-patch-version: ['3.5.2', '3.5.3', '3.5.4']
+#        scala-version: ['2.12']
+#        is_push_event:
+#          - ${{ github.event_name == 'push' }}
+#      fail-fast: false
+#    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-patch-version}}-scala-${{matrix.scala-version}}
+#    runs-on: ${{ matrix.os }}
+#    container:
+#      image: amd64/rust
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Setup Rust & Java toolchain
+#        uses: ./.github/actions/setup-builder
+#        with:
+#          rust-version: ${{env.RUST_VERSION}}
+#          jdk-version: ${{ matrix.java_version }}
+#      - name: Java test steps
+#        uses: ./.github/actions/java-test
+#        with:
+#          maven_opts: "-Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-patch-version }}"
+#          # upload test reports only for java 17
+#          upload-test-reports: ${{ matrix.java_version == '17' }}
+#          
+#  linux-test-native-datafusion-scan:
+#    strategy:
+#      matrix:
+#        os: [ubuntu-latest]
+#        scan_impl: ['native_datafusion', 'native_iceberg_compat']
+#        java_version: [17]
+#        spark-version: ['3.5']
+#        scala-version: ['2.12']
+#      fail-fast: false
+#    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}-${{ matrix.scan_impl }}
+#    runs-on: ${{ matrix.os }}
+#    env:
+#      COMET_PARQUET_SCAN_IMPL: ${{ matrix.scan_impl }}
+#    container:
+#      image: amd64/rust
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Setup Rust & Java toolchain
+#        uses: ./.github/actions/setup-builder
+#        with:
+#          rust-version: ${{env.RUST_VERSION}}
+#          jdk-version: ${{ matrix.java_version }}
+#      - name: Java test steps
+#        uses: ./.github/actions/java-test
+#        with:
+#          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
+#          # upload test reports only for java 17
+#          upload-test-reports: ${{ matrix.java_version == '17' }}
+#

From 406e1bdc18d3e4b14e3e3f6435bf21e1ba76303f Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 12:45:04 -0600
Subject: [PATCH 04/11] fix

---
 .github/workflows/pr_build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr_build_linux.yml b/.github/workflows/pr_build_linux.yml
index 7f9e9c78ba..9bba2835b8 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: PR Build
+name: PR Build (Linux)
 
 concurrency:
   group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -134,7 +134,7 @@ jobs:
         uses: ./.github/actions/java-test
         with:
           suite: ${{ matrix.suite.value }}
-          maven_opts: ${{ profile.maven_opts }}
+          maven_opts: ${{ matrix.profile.maven_opts }}
           upload-test-reports: true
 
 

From d5fe0f1f2e50a409fe39f917730784df41d921a3 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 13:10:27 -0600
Subject: [PATCH 05/11] fix

---
 .github/workflows/pr_build_linux.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pr_build_linux.yml b/.github/workflows/pr_build_linux.yml
index 9bba2835b8..24fef20555 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -68,10 +68,10 @@ jobs:
         os: [ubuntu-latest]
         profile:
           - name: "Spark 3.5, JDK 17, Scala 2.12"
-            java-version: "17"
+            java_version: "17"
             maven_opts: "-Pspark-3.5 -Pscala-2.12"
           - name: "Spark 4.0, JDK 17"
-            java-version: "17"
+            java_version: "17"
             maven_opts: "-Pspark-4.0"
         suite:
           - name: "fuzz"

From 18a12995135f208747ee0bcdc3d242a43384c527 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 13:43:03 -0600
Subject: [PATCH 06/11] fix

---
 .github/workflows/pr_build_linux.yml | 2 +-
 .github/workflows/pr_build_macos.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/pr_build_linux.yml b/.github/workflows/pr_build_linux.yml
index 24fef20555..82a3284fbd 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -133,7 +133,7 @@ jobs:
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
-          suite: ${{ matrix.suite.value }}
+          suites: ${{ matrix.suite.value }}
           maven_opts: ${{ matrix.profile.maven_opts }}
           upload-test-reports: true
 
diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index ce8e5fa381..a2f9607bc3 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -69,7 +69,6 @@ jobs:
         with:
           maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
 
-
   macos-aarch64-test:
     strategy:
       matrix:

From f8cc25fdc7f108c9df48fc63614e209b14353a12 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 13:44:25 -0600
Subject: [PATCH 07/11] fix

---
 .github/workflows/pr_build_macos.yml | 53 ++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index a2f9607bc3..705ae86c49 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -75,13 +75,53 @@ jobs:
         java_version: [17]
         spark-version: ['3.4', '3.5', '4.0']
         scala-version: ['2.13']
-        is_push_event:
-          - ${{ github.event_name == 'push' }}
-        exclude:
-          - java_version: 11
-            is_push_event: false
+        suite:
+          - name: "fuzz"
+            value: |
+              org.apache.comet.CometFuzzTestSuite
+              org.apache.comet.DataGeneratorSuite
+          - name: "shuffle"
+            value: |
+              org.apache.comet.exec.CometShuffleSuite
+              org.apache.comet.exec.CometShuffle4_0Suite
+              org.apache.comet.exec.CometNativeShuffleSuite
+              org.apache.comet.exec.CometShuffleEncryptionSuite
+              org.apache.comet.exec.CometShuffleManagerSuite
+              org.apache.comet.exec.CometAsyncShuffleSuite
+              org.apache.comet.exec.DisableAQECometShuffleSuite
+              org.apache.comet.exec.DisableAQECometAsyncShuffleSuite
+          - name: "parquet"
+            value: |
+              org.apache.comet.parquet.ParquetReadV1Suite
+              org.apache.comet.parquet.ParquetReadV2Suite
+              org.apache.spark.sql.comet.ParquetDatetimeRebaseV1Suite
+              org.apache.spark.sql.comet.ParquetDatetimeRebaseV2Suite
+              org.apache.spark.sql.comet.ParquetEncryptionITCase
+              org.apache.comet.exec.CometNativeReaderSuite
+          - name: "exec"
+            value: |
+              org.apache.comet.exec.CometAggregateSuite
+              org.apache.comet.exec.CometExec3_4PlusSuite
+              org.apache.comet.exec.CometExecSuite
+              org.apache.comet.exec.CometJoinSuite
+              org.apache.comet.CometArrayExpressionSuite
+              org.apache.comet.CometCastSuite
+              org.apache.comet.CometExpressionSuite
+              org.apache.comet.CometExpressionCoverageSuite
+              org.apache.comet.CometNativeSuite
+              org.apache.comet.CometSparkSessionExtensionsSuite
+              org.apache.spark.CometPluginsSuite
+              org.apache.spark.CometPluginsDefaultSuite
+              org.apache.spark.CometPluginsNonOverrideSuite
+              org.apache.spark.CometPluginsUnifiedModeOverrideSuite
+              org.apache.spark.sql.CometTPCDSQuerySuite
+              org.apache.spark.sql.CometTPCDSQueryTestSuite
+              org.apache.spark.sql.CometTPCHQuerySuite
+              org.apache.spark.sql.comet.CometTPCDSV1_4_PlanStabilitySuite
+              org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
+              org.apache.spark.sql.comet.CometTaskMetricsSuite
       fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}
+    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}} [${{matrix.suite.name}}]
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
@@ -95,4 +135,5 @@ jobs:
       - name: Java test steps
         uses: ./.github/actions/java-test
         with:
+          suites: ${{ matrix.suite.value }}
           maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
\ No newline at end of file

From 9ff4192c0a518b23c2eb0a0491e1a90e845d7d1a Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 13:44:48 -0600
Subject: [PATCH 08/11] fix

---
 .github/workflows/pr_build_macos.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index 705ae86c49..d11c065a94 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -41,34 +41,6 @@ env:
 
 jobs:
 
-  # test a single Spark version on Intel, and not on PRs
-  macos-x86-test:
-    strategy:
-      matrix:
-        os: [macos-13]
-        java_version: [11]
-        spark-version: ['3.5']
-        scala-version: ['2.12']
-      fail-fast: false
-    if: github.event_name == 'push'
-    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust & Java toolchain
-        uses: ./.github/actions/setup-macos-builder
-        with:
-          rust-version: ${{env.RUST_VERSION}}
-          jdk-version: ${{ matrix.java_version }}
-      - if: matrix.test-target == 'rust'
-        name: Rust test steps
-        uses: ./.github/actions/rust-test
-      - if: matrix.test-target == 'java'
-        name: Java test steps
-        uses: ./.github/actions/java-test
-        with:
-          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-
   macos-aarch64-test:
     strategy:
       matrix:

From f9a473692c3cc9896c99de8600ab280883d515e3 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 15:55:31 -0600
Subject: [PATCH 09/11] native scans

---
 .github/actions/java-test/action.yaml |  8 +++
 .github/workflows/pr_build_linux.yml  | 92 ++++++++-------------------
 .github/workflows/pr_build_macos.yml  |  1 +
 3 files changed, 35 insertions(+), 66 deletions(-)

diff --git a/.github/actions/java-test/action.yaml b/.github/actions/java-test/action.yaml
index c0ff974aa3..634c42a640 100644
--- a/.github/actions/java-test/action.yaml
+++ b/.github/actions/java-test/action.yaml
@@ -26,6 +26,10 @@ inputs:
     description: 'Maven options passed to the mvn command'
     required: false
     default: ''
+  scan_impl:
+    description: 'The default Parquet scan implementation'
+    required: false
+    default: 'native_comet'
   upload-test-reports:
     description: 'Whether to upload test results including coverage to GitHub'
     required: false
@@ -58,11 +62,15 @@ runs:
     - name: Run all tests
       shell: bash
       if: ${{ inputs.suites == '' }}
+      env:
+        COMET_PARQUET_SCAN_IMPL: ${{ inputs.scan_impl }}
       run: |
         MAVEN_OPTS="-XX:+UnlockDiagnosticVMOptions -XX:+ShowMessageBoxOnError -XX:+HeapDumpOnOutOfMemoryError -XX:ErrorFile=./hs_err_pid%p.log" SPARK_HOME=`pwd` ./mvnw -B clean install ${{ inputs.maven_opts }}
     - name: Run specified tests
       shell: bash
       if: ${{ inputs.suites != '' }}
+      env:
+        COMET_PARQUET_SCAN_IMPL: ${{ inputs.scan_impl }}
       run: |
         MAVEN_SUITES="$(echo "${{ inputs.suites }}" | paste -sd, -)"
         echo "Running with MAVEN_SUITES=$MAVEN_SUITES"
diff --git a/.github/workflows/pr_build_linux.yml b/.github/workflows/pr_build_linux.yml
index 82a3284fbd..8022a0eea3 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -66,10 +66,31 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
+        # the goal with these profiles is to get coverage of all Java, Scala, and Spark
+        # versions without testing all possible combinations, which would be overkill
         profile:
-          - name: "Spark 3.5, JDK 17, Scala 2.12"
+          - name: "Spark 3.4, JDK 11, Scala 2.12"
+            java_version: "11"
+            maven_opts: "-Pspark-3.4 -Pscala-2.12"
+
+          - name: "Spark 3.5, JDK 11, Scala 2.12"
+            java_version: "17"
+            maven_opts: "-Pspark-3.5 -Pscala-2.12"
+
+          - name: "Spark 3.5, JDK 17, Scala 2.13"
+            java_version: "17"
+            maven_opts: "-Pspark-3.5 -Pscala-2.13"
+
+          - name: "Spark 3.5, JDK 17, Scala 2.12 native_datafusion"
+            java_version: "17"
+            maven_opts: "-Pspark-3.5 -Pscala-2.12"
+            scan_impl: "native_datafusion"
+
+          - name: "Spark 3.5, JDK 17, Scala 2.12 native_iceberg_compat"
             java_version: "17"
             maven_opts: "-Pspark-3.5 -Pscala-2.12"
+            scan_impl: "native_iceberg_compat"
+
           - name: "Spark 4.0, JDK 17"
             java_version: "17"
             maven_opts: "-Pspark-4.0"
@@ -108,6 +129,7 @@ jobs:
               org.apache.comet.CometExpressionCoverageSuite
               org.apache.comet.CometNativeSuite
               org.apache.comet.CometSparkSessionExtensionsSuite
+              org.apache.comet.CometStringExpressionSuite
               org.apache.spark.CometPluginsSuite
               org.apache.spark.CometPluginsDefaultSuite
               org.apache.spark.CometPluginsNonOverrideSuite
@@ -119,7 +141,7 @@ jobs:
               org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
               org.apache.spark.sql.comet.CometTaskMetricsSuite
       fail-fast: false
-    name: ${{ matrix.os }}/java ${{ matrix.profile.name }} [${{ matrix.suite.name }}]
+    name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name }}]
     runs-on: ${{ matrix.os }}
     container:
       image: amd64/rust
@@ -135,67 +157,5 @@ jobs:
         with:
           suites: ${{ matrix.suite.value }}
           maven_opts: ${{ matrix.profile.maven_opts }}
-          upload-test-reports: true
-
-
-# TODO
-
-  # run Comet tests for older 3.5.x releases with one java and scala versions
-#  linux-test-35-minor-versions:
-#    strategy:
-#      matrix:
-#        os: [ubuntu-latest]
-#        java_version: [17]
-#        spark-version: ['3.5']
-#        spark-patch-version: ['3.5.2', '3.5.3', '3.5.4']
-#        scala-version: ['2.12']
-#        is_push_event:
-#          - ${{ github.event_name == 'push' }}
-#      fail-fast: false
-#    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-patch-version}}-scala-${{matrix.scala-version}}
-#    runs-on: ${{ matrix.os }}
-#    container:
-#      image: amd64/rust
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Setup Rust & Java toolchain
-#        uses: ./.github/actions/setup-builder
-#        with:
-#          rust-version: ${{env.RUST_VERSION}}
-#          jdk-version: ${{ matrix.java_version }}
-#      - name: Java test steps
-#        uses: ./.github/actions/java-test
-#        with:
-#          maven_opts: "-Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }} -Dspark.version=${{ matrix.spark-patch-version }}"
-#          # upload test reports only for java 17
-#          upload-test-reports: ${{ matrix.java_version == '17' }}
-#          
-#  linux-test-native-datafusion-scan:
-#    strategy:
-#      matrix:
-#        os: [ubuntu-latest]
-#        scan_impl: ['native_datafusion', 'native_iceberg_compat']
-#        java_version: [17]
-#        spark-version: ['3.5']
-#        scala-version: ['2.12']
-#      fail-fast: false
-#    name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}-${{ matrix.scan_impl }}
-#    runs-on: ${{ matrix.os }}
-#    env:
-#      COMET_PARQUET_SCAN_IMPL: ${{ matrix.scan_impl }}
-#    container:
-#      image: amd64/rust
-#    steps:
-#      - uses: actions/checkout@v4
-#      - name: Setup Rust & Java toolchain
-#        uses: ./.github/actions/setup-builder
-#        with:
-#          rust-version: ${{env.RUST_VERSION}}
-#          jdk-version: ${{ matrix.java_version }}
-#      - name: Java test steps
-#        uses: ./.github/actions/java-test
-#        with:
-#          maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{ matrix.scala-version }}
-#          # upload test reports only for java 17
-#          upload-test-reports: ${{ matrix.java_version == '17' }}
-#
+          scan_impl: ${{ matrix.profile.scan_impl }}
+          upload-test-reports: true
\ No newline at end of file
diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index d11c065a94..e21c393dde 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -82,6 +82,7 @@ jobs:
               org.apache.comet.CometExpressionCoverageSuite
               org.apache.comet.CometNativeSuite
               org.apache.comet.CometSparkSessionExtensionsSuite
+              org.apache.comet.CometStringExpressionSuite
               org.apache.spark.CometPluginsSuite
               org.apache.spark.CometPluginsDefaultSuite
               org.apache.spark.CometPluginsNonOverrideSuite

From 8e842a0205b7c24a52b8e0c6fc46f480a43d30fa Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 15:57:37 -0600
Subject: [PATCH 10/11] fix

---
 .github/workflows/pr_build_macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr_build_macos.yml b/.github/workflows/pr_build_macos.yml
index e21c393dde..85b40ac5b5 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -94,7 +94,7 @@ jobs:
               org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
               org.apache.spark.sql.comet.CometTaskMetricsSuite
       fail-fast: false
-    name: macos-14(Silicon)/java ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}} [${{matrix.suite.name}}]
+    name: macos-14(Silicon)/ ${{ matrix.java_version }}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}} [${{matrix.suite.name}}]
     runs-on: macos-14
     steps:
       - uses: actions/checkout@v4

From d46c8a51ff77709b255088526af4e64e4f874fc3 Mon Sep 17 00:00:00 2001
From: Andy Grove <agrove@apache.org>
Date: Wed, 28 May 2025 16:30:04 -0600
Subject: [PATCH 11/11] fix

---
 .github/workflows/pr_build_linux.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/pr_build_linux.yml b/.github/workflows/pr_build_linux.yml
index 8022a0eea3..732b5b4d15 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -72,14 +72,17 @@ jobs:
           - name: "Spark 3.4, JDK 11, Scala 2.12"
             java_version: "11"
             maven_opts: "-Pspark-3.4 -Pscala-2.12"
+            scan_impl: "native_comet"
 
           - name: "Spark 3.5, JDK 11, Scala 2.12"
             java_version: "17"
             maven_opts: "-Pspark-3.5 -Pscala-2.12"
+            scan_impl: "native_comet"
 
           - name: "Spark 3.5, JDK 17, Scala 2.13"
             java_version: "17"
             maven_opts: "-Pspark-3.5 -Pscala-2.13"
+            scan_impl: "native_comet"
 
           - name: "Spark 3.5, JDK 17, Scala 2.12 native_datafusion"
             java_version: "17"
@@ -94,6 +97,7 @@ jobs:
           - name: "Spark 4.0, JDK 17"
             java_version: "17"
             maven_opts: "-Pspark-4.0"
+            scan_impl: "native_comet"
         suite:
           - name: "fuzz"
             value: |