From 48cc6c3e9fea0027055990f9b398eb4b341d0697 Mon Sep 17 00:00:00 2001
From: Andrew Lamb <andrew@nerdnetworks.org>
Date: Thu, 28 Jul 2022 16:04:25 -0400
Subject: [PATCH] remove redundant CI benchmark check, cleanups (#2212)

* remove redundant CI benchmark check, cleanups

* cleanup

* Clarify the intent of parquet library compilation check, and add missing case

* Update .github/workflows/parquet.yml

Co-authored-by: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>

Co-authored-by: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com>
---
 .github/workflows/parquet.yml | 22 ++++++++++++++++++----
 .github/workflows/rust.yml    | 33 ---------------------------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/parquet.yml b/.github/workflows/parquet.yml
index 7ff230ea5115..d8e09f04ba83 100644
--- a/.github/workflows/parquet.yml
+++ b/.github/workflows/parquet.yml
@@ -76,6 +76,17 @@ jobs:
         uses: ./.github/actions/setup-builder
         with:
           rust-version: stable
+
+        # Run different tests for the library on its own as well as
+        # all targets to ensure that it still works in the absence of
+        # features that might be enabled by dev-dependencies of other
+        # targets.
+        #
+        # This for each of (library and all-targets), check
+        # 1. compiles with default features
+        # 1. compiles with no default features
+        # 3. compiles with just arrow feature
+        # 3. compiles with all features
       - name: Check compilation
         run: |
           cargo check -p parquet
@@ -91,12 +102,15 @@ jobs:
       - name: Check compilation --all-targets
         run: |
           cargo check -p parquet --all-targets
-      - name: Check compilation --no-default-features --all-targets
+      - name: Check compilation --all-targets --no-default-features
+        run: |
+          cargo check -p parquet --all-targets --no-default-features
+      - name: Check compilation  --all-targets --no-default-features --features arrow
         run: |
-          cargo check -p parquet --no-default-features --all-targets
-      - name: Check compilation --no-default-features --features-arrow --all-targets
+          cargo check -p parquet --all-targets --no-default-features --features arrow
+      - name: Check compilation  --all-targets --all-features
         run: |
-          cargo check -p parquet --no-default-features --features arrow --all-targets
+          cargo check -p parquet --all-targets --all-features
 
   clippy:
     name: Clippy
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 51e31ba99366..8464a22b6b94 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -47,36 +47,10 @@ jobs:
       - name: Run tests
         shell: bash
         run: |
-          export ARROW_TEST_DATA=$(pwd)/testing/data
-          export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
           # do not produce debug symbols to keep memory usage down
           export RUSTFLAGS="-C debuginfo=0"
           cargo test
 
-  check_benches:
-    name: Check Benchmarks (but don't run them)
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: [ amd64 ]
-        rust: [ stable ]
-    container:
-      image: ${{ matrix.arch }}/rust
-      env:
-        # Disable full debug symbol generation to speed up CI build and keep memory down
-        # "1" means line tables only, which is useful for panic tracebacks.
-        RUSTFLAGS: "-C debuginfo=1"
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - name: Setup Rust toolchain
-        uses: ./.github/actions/setup-builder
-        with:
-          rust-version: ${{ matrix.rust }}
-      - name: Check benchmarks
-        run: |
-          cargo check --benches --workspace --features test_common,prettyprint,async,experimental
 
   # Run cargo fmt for all crates
   lint:
@@ -113,16 +87,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: /home/runner/.cargo
-          # this key is not equal because the user is different than on a container (runner vs github)
           key: cargo-coverage-cache3-
       - name: Run coverage
         run: |
-          export CARGO_HOME="/home/runner/.cargo"
-          export CARGO_TARGET_DIR="/home/runner/target"
-
-          export ARROW_TEST_DATA=$(pwd)/testing/data
-          export PARQUET_TEST_DATA=$(pwd)/parquet-testing/data
-
           rustup toolchain install stable
           rustup default stable
           cargo install --version 0.18.2 cargo-tarpaulin