From f8b499ae8cb04ad710034c66c6cd241fe01706ac Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Tue, 27 May 2025 11:12:17 -0600 Subject: [PATCH 1/3] stop running Spark 4 tests on Linux --- .github/workflows/pr_build.yml | 52 +++++++++++++++++----------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 1ae94f2741..117831840c 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -149,32 +149,32 @@ jobs: # upload test reports only for java 17 upload-test-reports: ${{ matrix.java_version == '17' }} - linux-test-with-spark4_0: - strategy: - matrix: - os: [ubuntu-latest] - java_version: [17] - test-target: [java] - spark-version: ['4.0'] - is_push_event: - - ${{ github.event_name == 'push' }} - fail-fast: false - name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-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 }} - upload-test-reports: true +# linux-test-with-spark4_0: +# strategy: +# matrix: +# os: [ubuntu-latest] +# java_version: [17] +# test-target: [java] +# spark-version: ['4.0'] +# is_push_event: +# - ${{ github.event_name == 'push' }} +# fail-fast: false +# name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-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 }} +# upload-test-reports: true linux-test-with-old-spark: strategy: From ead362c23440f35783e65e81d613899b6d45afad Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Tue, 27 May 2025 11:28:18 -0600 Subject: [PATCH 2/3] address feedback --- .github/workflows/pr_build.yml | 27 ---------- .github/workflows/pr_build_spark4.yml | 72 +++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 27 deletions(-) create mode 100644 .github/workflows/pr_build_spark4.yml diff --git a/.github/workflows/pr_build.yml b/.github/workflows/pr_build.yml index 117831840c..308dd2d68c 100644 --- a/.github/workflows/pr_build.yml +++ b/.github/workflows/pr_build.yml @@ -149,33 +149,6 @@ jobs: # upload test reports only for java 17 upload-test-reports: ${{ matrix.java_version == '17' }} -# linux-test-with-spark4_0: -# strategy: -# matrix: -# os: [ubuntu-latest] -# java_version: [17] -# test-target: [java] -# spark-version: ['4.0'] -# is_push_event: -# - ${{ github.event_name == 'push' }} -# fail-fast: false -# name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-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 }} -# upload-test-reports: true - linux-test-with-old-spark: strategy: matrix: diff --git a/.github/workflows/pr_build_spark4.yml b/.github/workflows/pr_build_spark4.yml new file mode 100644 index 0000000000..dc0a96c8d8 --- /dev/null +++ b/.github/workflows/pr_build_spark4.yml @@ -0,0 +1,72 @@ +# 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 (Linux + Spark 4) + +concurrency: + group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }} + cancel-in-progress: true + +on: + +# temporarily disabled on PRs due to https://github.com/apache/datafusion-comet/issues/1786 +# 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: + + linux-test-with-spark4_0: + strategy: + matrix: + os: [ubuntu-latest] + java_version: [17] + test-target: [java] + spark-version: ['4.0'] + is_push_event: + - ${{ github.event_name == 'push' }} + fail-fast: false + name: ${{ matrix.os }}/java ${{ matrix.java_version }}-spark-${{matrix.spark-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 }} + upload-test-reports: true + From 390a90f30335c0031afeb446d487247825bae00b Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Tue, 27 May 2025 11:28:39 -0600 Subject: [PATCH 3/3] address feedback --- .../workflows/{pr_build_spark4.yml => pr_build_linux_spark4.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{pr_build_spark4.yml => pr_build_linux_spark4.yml} (100%) diff --git a/.github/workflows/pr_build_spark4.yml b/.github/workflows/pr_build_linux_spark4.yml similarity index 100% rename from .github/workflows/pr_build_spark4.yml rename to .github/workflows/pr_build_linux_spark4.yml