This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new 770f63766 chore: Use unique artifact names in Java test run (#1818)
770f63766 is described below
commit 770f6376601eb5713649e12dba24474d6026444d
Author: Andy Grove <agr...@apache.org>
AuthorDate: Mon Jun 2 12:41:46 2025 -0600
chore: Use unique artifact names in Java test run (#1818)
---
.github/actions/java-test/action.yaml | 11 +++++++----
.github/workflows/pr_build_linux.yml | 1 +
.github/workflows/pr_build_macos.yml | 29 ++++++++++++++++++++++-------
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/.github/actions/java-test/action.yaml
b/.github/actions/java-test/action.yaml
index 634c42a64..b205092ff 100644
--- a/.github/actions/java-test/action.yaml
+++ b/.github/actions/java-test/action.yaml
@@ -18,8 +18,11 @@
name: "Java Test"
description: "Run Java tests"
inputs:
+ artifact_name:
+ description: "Unique name for uploaded artifacts for this run"
+ required: true
suites:
- description: 'Which test suites to run'
+ description: 'Which Scalatest test suites to run'
required: false
default: ''
maven_opts:
@@ -79,7 +82,7 @@ runs:
if: failure()
uses: actions/upload-artifact@v4
with:
- name: crash-logs-${{ github.run_id }}-${{ github.run_number }}-${{
github.run_attempt }}
+ name: crash-logs-${{ inputs.artifact_name }}
path: "**/hs_err_pid*.log"
- name: Debug listing
if: failure()
@@ -93,13 +96,13 @@ runs:
if: failure()
uses: actions/upload-artifact@v4
with:
- name: unit-tests-${{ github.run_id }}-${{ github.run_number }}-${{
github.run_attempt }}
+ name: unit-tests-${{ inputs.artifact_name }}
path: "**/target/unit-tests.log"
- name: Upload test results
if: ${{ inputs.upload-test-reports == 'true' }}
uses: actions/upload-artifact@v4
with:
- name: java-test-reports-${{ github.run_id }}-${{ github.run_number
}}-${{ github.run_attempt }}
+ name: java-test-reports-${{ inputs.artifact_name }}
path: "**/target/surefire-reports/*.txt"
retention-days: 7 # 1 week for test reports
overwrite: true
diff --git a/.github/workflows/pr_build_linux.yml
b/.github/workflows/pr_build_linux.yml
index 732b5b4d1..8d5ade876 100644
--- a/.github/workflows/pr_build_linux.yml
+++ b/.github/workflows/pr_build_linux.yml
@@ -159,6 +159,7 @@ jobs:
- name: Java test steps
uses: ./.github/actions/java-test
with:
+ artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{
matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{
github.run_attempt }}
suites: ${{ matrix.suite.value }}
maven_opts: ${{ matrix.profile.maven_opts }}
scan_impl: ${{ matrix.profile.scan_impl }}
diff --git a/.github/workflows/pr_build_macos.yml
b/.github/workflows/pr_build_macos.yml
index 85b40ac5b..0ae35b7f8 100644
--- a/.github/workflows/pr_build_macos.yml
+++ b/.github/workflows/pr_build_macos.yml
@@ -44,9 +44,23 @@ jobs:
macos-aarch64-test:
strategy:
matrix:
- java_version: [17]
- spark-version: ['3.4', '3.5', '4.0']
- scala-version: ['2.13']
+ os: [macos-14]
+
+ # 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.4, JDK 11, Scala 2.12"
+ java_version: "11"
+ maven_opts: "-Pspark-3.4 -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 4.0, JDK 17, Scala 2.13"
+ java_version: "17"
+ maven_opts: "-Pspark-4.0 -Pscala-2.13"
+
suite:
- name: "fuzz"
value: |
@@ -94,19 +108,20 @@ jobs:
org.apache.spark.sql.comet.CometTPCDSV2_7_PlanStabilitySuite
org.apache.spark.sql.comet.CometTaskMetricsSuite
fail-fast: false
- name: macos-14(Silicon)/ ${{ matrix.java_version
}}-spark-${{matrix.spark-version}}-scala-${{matrix.scala-version}}
[${{matrix.suite.name}}]
- runs-on: macos-14
+ name: ${{ matrix.os }}/${{ matrix.profile.name }} [${{ matrix.suite.name
}}]
+ 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 }}
+ jdk-version: ${{ matrix.profile.java_version }}
jdk-architecture: aarch64
protoc-architecture: aarch_64
- name: Java test steps
uses: ./.github/actions/java-test
with:
+ artifact_name: ${{ matrix.os }}-${{ matrix.profile.name }}-${{
matrix.suite.name }}-${{ github.run_id }}-${{ github.run_number }}-${{
github.run_attempt }}
suites: ${{ matrix.suite.value }}
- maven_opts: -Pspark-${{ matrix.spark-version }},scala-${{
matrix.scala-version }}
\ No newline at end of file
+ maven_opts: ${{ matrix.profile.maven_opts }}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@datafusion.apache.org
For additional commands, e-mail: commits-h...@datafusion.apache.org
