From 1e224f71367378b842949c1f3a3a1b281cdcef96 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Mon, 29 Sep 2025 20:39:06 -0600 Subject: [PATCH] build: Stop caching libcomet in CI (#2498) * stop caching libcomet in CI * fix --- .../{benchmark.yml => benchmark-tpcds.yml} | 21 ++++--------------- .github/workflows/benchmark-tpch.yml | 16 ++------------ 2 files changed, 6 insertions(+), 31 deletions(-) rename .github/workflows/{benchmark.yml => benchmark-tpcds.yml} (90%) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark-tpcds.yml similarity index 90% rename from .github/workflows/benchmark.yml rename to .github/workflows/benchmark-tpcds.yml index 4228be86bb..45f723a253 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark-tpcds.yml @@ -63,7 +63,8 @@ jobs: key: ${{ runner.os }}-java-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-java-maven- - + - name: Build Comet + run: make release - name: Cache TPC-DS generated data id: cache-tpcds-sf-1 uses: actions/cache@v4 @@ -76,17 +77,6 @@ jobs: with: repository: databricks/tpcds-kit path: ./tpcds-kit - - name: Build Comet - run: make release - - name: Upload Comet native lib - uses: actions/upload-artifact@v4 - with: - name: libcomet-${{ github.run_id }} - path: | - native/target/release/libcomet.so - native/target/release/libcomet.dylib - retention-days: 1 # remove the artifact after 1 day, only valid for this workflow - overwrite: true - name: Build tpcds-kit if: steps.cache-tpcds-sf-1.outputs.cache-hit != 'true' run: | @@ -132,11 +122,8 @@ jobs: path: ./tpcds-sf-1 key: tpcds-${{ hashFiles('.github/workflows/benchmark.yml') }} fail-on-cache-miss: true # it's always be cached as it should be generated by pre-step if not existed - - name: Download Comet native lib - uses: actions/download-artifact@v5 - with: - name: libcomet-${{ github.run_id }} - path: native/target/release + - name: Build Comet + run: make release - name: Run TPC-DS queries (Sort merge join) if: matrix.join == 'sort_merge' run: | diff --git a/.github/workflows/benchmark-tpch.yml b/.github/workflows/benchmark-tpch.yml index faea5f2e95..463f69228f 100644 --- a/.github/workflows/benchmark-tpch.yml +++ b/.github/workflows/benchmark-tpch.yml @@ -71,15 +71,6 @@ jobs: key: tpch-${{ hashFiles('.github/workflows/benchmark-tpch.yml') }} - name: Build Comet run: make release - - name: Upload Comet native lib - uses: actions/upload-artifact@v4 - with: - name: libcomet-${{ github.run_id }} - path: | - native/target/release/libcomet.so - native/target/release/libcomet.dylib - retention-days: 1 # remove the artifact after 1 day, only valid for this workflow - overwrite: true - name: Generate TPC-H (SF=1) table data if: steps.cache-tpch-sf-1.outputs.cache-hit != 'true' run: | @@ -115,11 +106,8 @@ jobs: path: ./tpch key: tpch-${{ hashFiles('.github/workflows/benchmark-tpch.yml') }} fail-on-cache-miss: true # it's always be cached as it should be generated by pre-step if not existed - - name: Download Comet native lib - uses: actions/download-artifact@v5 - with: - name: libcomet-${{ github.run_id }} - path: native/target/release + - name: Build Comet + run: make release - name: Run TPC-H queries run: | SPARK_HOME=`pwd` SPARK_TPCH_DATA=`pwd`/tpch/sf1_parquet ./mvnw -B -Prelease -Dsuites=org.apache.spark.sql.CometTPCHQuerySuite test