Skip to content

Commit

Permalink
Merge pull request #3035 from o1-labs/martin/saffron-disable-codecove…
Browse files Browse the repository at this point in the history
…rage

Run Saffron in it's own workflow, restore OG CI for core lib only
  • Loading branch information
dannywillems authored Feb 13, 2025
2 parents 4c055b2 + a40d707 commit 91ee806
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ env:
CARGO_TERM_COLOR: always
# 30 MB of stack for Keccak tests
RUST_MIN_STACK: 31457280
CARGO_EXTRA_ARGS: "--workspace --exclude saffron"

jobs:
run_mdbook:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/saffron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ jobs:
run: |
cargo build --release --bin saffron
- name: Run the saffron unit tests
run: |
SRS_FILEPATH=../srs/test_vesta.srs RUST_LOG=debug cargo test -p saffron --release -- --nocapture
- name: Run the saffron e2e encoding tests on small lorem file
run: |
./saffron/e2e-test.sh saffron/fixtures/lorem.txt ./srs/test_vesta.srs
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -96,24 +96,24 @@ test-all-with-coverage:


nextest: ## Test the project with non-heavy tests and using nextest test runner
cargo nextest run --all-features --release --profile ci -E "not test(heavy)" $(BIN_EXTRA_ARGS)
cargo nextest run --all-features --release $(CARGO_EXTRA_ARGS) --profile ci -E "not test(heavy)" $(BIN_EXTRA_ARGS)

nextest-with-coverage:
$(COVERAGE_ENV) BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest
$(COVERAGE_ENV) CARGO_EXTRA_ARGS="$(CARGO_EXTRA_ARGS)" BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest


nextest-heavy: ## Test the project with heavy tests and using nextest test runner
cargo nextest run --all-features --release --profile ci -E "test(heavy)" $(BIN_EXTRA_ARGS)
cargo nextest run --all-features --release $(CARGO_EXTRA_ARGS) --profile ci -E "test(heavy)" $(BIN_EXTRA_ARGS)

nextest-heavy-with-coverage:
$(COVERAGE_ENV) BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest-heavy
$(COVERAGE_ENV) CARGO_EXTRA_ARGS="$(CARGO_EXTRA_ARGS)" BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest-heavy


nextest-all: ## Test the project with all tests and using nextest test runner
cargo nextest run --all-features --release --profile ci $(BIN_EXTRA_ARGS)
cargo nextest run --all-features --release $(CARGO_EXTRA_ARGS) --profile ci $(BIN_EXTRA_ARGS)

nextest-all-with-coverage:
$(COVERAGE_ENV) BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest-all
$(COVERAGE_ENV) CARGO_EXTRA_ARGS="$(CARGO_EXTRA_ARGS)" BIN_EXTRA_ARGS="$(BIN_EXTRA_ARGS)" $(MAKE) nextest-all


format: ## Format the code
Expand Down

0 comments on commit 91ee806

Please sign in to comment.