From d85b3e569354bf85496f108c56b432f49a0448e7 Mon Sep 17 00:00:00 2001 From: Trey Lowerison <19714082+tlowerison@users.noreply.github.com> Date: Sat, 4 Nov 2023 01:54:08 -0700 Subject: [PATCH] revert changes made to CI cargo test phase --- .github/workflows/continuous_integration.yml | 7 ------- .pre-commit-config.yaml | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index d27ff4c..cd30f0d 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -42,13 +42,6 @@ jobs: - uses: actions/checkout@v4 - - name: Set environment variables to be used during cargo test phase (will generate codecov report bindings) - run: | - echo $'CARGO_INCREMENTAL="0" - RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests" - RUSTDOCFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests"' \ - > .cargo-test.env - - run: pre-commit run --all-files --hook-stage push - name: rust-grcov diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a313778..c363dc1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -127,7 +127,12 @@ repos: entry: sh args: - -c - - source .cargo-test.env; cargo test --all-features + - | + CARGO_INCREMENTAL="0" \ + RUSTFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests" \ + RUSTDOCFLAGS="-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests" \ + cargo test \ + --all-features language: system types: [rust] pass_filenames: false