From baa74df21de17142987856c90b9f33399f3bf8f8 Mon Sep 17 00:00:00 2001 From: "dustin.ray" Date: Mon, 28 Oct 2024 16:48:03 -0700 Subject: [PATCH 1/2] fix: move examples into a different job --- .github/workflows/examples.yml | 67 +++++++++++++++++++++++++++++ .github/workflows/lint-and-test.yml | 32 -------------- 2 files changed, 67 insertions(+), 32 deletions(-) create mode 100644 .github/workflows/examples.yml diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml new file mode 100644 index 000000000..ac7c2a212 --- /dev/null +++ b/.github/workflows/examples.yml @@ -0,0 +1,67 @@ +name: Example Runs + +on: + workflow_call: + pull_request: + types: [opened, synchronize, reopened] + merge_group: + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + +env: + CARGO_TERM_COLOR: always + BLITZAR_BACKEND: cpu + +jobs: + example-tests: + name: Run Example Commands + runs-on: large-8-core-32gb-22-04 + + steps: + - name: Checkout sources + uses: actions/checkout@v3 + + - name: Install stable toolchain + run: curl https://sh.rustup.rs -sSf | bash -s -- -y --profile minimal && source ~/.cargo/env + + - name: Install Dependencies + run: | + export DEBIAN_FRONTEND=non-interactive + sudo apt-get update + sudo apt-get install -y clang lld + + # Runs the examples + - name: Run hello_world example (With Blitzar) + run: cargo run --example hello_world --features="test" + - name: Run hello_world example (Without Blitzar and With Rayon) + run: cargo run --example hello_world --no-default-features --features="rayon test" + - name: Run hello_world example (Without Blitzar and Without Rayon) + run: cargo run --example hello_world --no-default-features --features="test" + - name: Run space example + run: cargo run --example space + - name: Run dog breeds example + run: cargo run --example dog_breeds + - name: Run wood types example + run: cargo run --example wood_types + - name: Run dinosaurs example + run: cargo run --example dinosaurs + - name: Run books example + run: cargo run --example books + - name: Run brands example + run: cargo run --example brands + - name: Run avocado-prices example + run: cargo run --example avocado-prices + - name: Run plastics example + run: cargo run --example plastics + - name: Run sushi example + run: cargo run --example sushi + - name: Run countries example + run: cargo run --example countries + - name: Run rockets example + run: cargo run --example rockets + - name: Run posql_db example (With Blitzar) + run: bash crates/proof-of-sql/examples/posql_db/run_example.sh + - name: Run posql_db example (Without Blitzar) + run: bash crates/proof-of-sql/examples/posql_db/run_example.sh --no-default-features --features="rayon" diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 5e291eda1..d7dafa84b 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -106,38 +106,6 @@ jobs: run: | cargo test proof_primitive::dory::dory_compute_commitments_test --no-default-features --features="std" && \ cargo test proof_primitive::dory::dynamic_dory_compute_commitments_test --no-default-features --features="std" - - name: Run hello_world example (With Blitzar) - run: cargo run --example hello_world --features="test" - - name: Run hello_world example (Without Blitzar and With Rayon) - run: cargo run --example hello_world --no-default-features --features="rayon test" - - name: Run hello_world example (Without Blitzar and Without Rayon) - run: cargo run --example hello_world --no-default-features --features="test" - - name: Run space example - run: cargo run --example space - - name: Run dog breeds example - run: cargo run --example dog_breeds - - name: Run wood types example - run: cargo run --example wood_types - - name: Run dinosaurs example - run: cargo run --example dinosaurs - - name: Run books example - run: cargo run --example books - - name: Run brands example - run: cargo run --example brands - - name: Run avocado-prices example - run: cargo run --example avocado-prices - - name: Run plastics example - run: cargo run --example plastics - - name: Run sushi example - run: cargo run --example sushi - - name: Run countries example - run: cargo run --example countries - - name: Run rockets example - run: cargo run --example rockets - - name: Run posql_db example (With Blitzar) - run: bash crates/proof-of-sql/examples/posql_db/run_example.sh - - name: Run posql_db example (Without Blitzar) - run: bash crates/proof-of-sql/examples/posql_db/run_example.sh --no-default-features --features="rayon" clippy: name: Clippy From dff34e8342f43b46a43d75497c2d86914ff6908d Mon Sep 17 00:00:00 2001 From: "dustin.ray" Date: Mon, 28 Oct 2024 17:55:40 -0700 Subject: [PATCH 2/2] fix: remove tests --- .github/workflows/examples.yml | 67 ----------------------------- .github/workflows/lint-and-test.yml | 12 ++++++ 2 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 .github/workflows/examples.yml diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml deleted file mode 100644 index ac7c2a212..000000000 --- a/.github/workflows/examples.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Example Runs - -on: - workflow_call: - pull_request: - types: [opened, synchronize, reopened] - merge_group: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - CARGO_TERM_COLOR: always - BLITZAR_BACKEND: cpu - -jobs: - example-tests: - name: Run Example Commands - runs-on: large-8-core-32gb-22-04 - - steps: - - name: Checkout sources - uses: actions/checkout@v3 - - - name: Install stable toolchain - run: curl https://sh.rustup.rs -sSf | bash -s -- -y --profile minimal && source ~/.cargo/env - - - name: Install Dependencies - run: | - export DEBIAN_FRONTEND=non-interactive - sudo apt-get update - sudo apt-get install -y clang lld - - # Runs the examples - - name: Run hello_world example (With Blitzar) - run: cargo run --example hello_world --features="test" - - name: Run hello_world example (Without Blitzar and With Rayon) - run: cargo run --example hello_world --no-default-features --features="rayon test" - - name: Run hello_world example (Without Blitzar and Without Rayon) - run: cargo run --example hello_world --no-default-features --features="test" - - name: Run space example - run: cargo run --example space - - name: Run dog breeds example - run: cargo run --example dog_breeds - - name: Run wood types example - run: cargo run --example wood_types - - name: Run dinosaurs example - run: cargo run --example dinosaurs - - name: Run books example - run: cargo run --example books - - name: Run brands example - run: cargo run --example brands - - name: Run avocado-prices example - run: cargo run --example avocado-prices - - name: Run plastics example - run: cargo run --example plastics - - name: Run sushi example - run: cargo run --example sushi - - name: Run countries example - run: cargo run --example countries - - name: Run rockets example - run: cargo run --example rockets - - name: Run posql_db example (With Blitzar) - run: bash crates/proof-of-sql/examples/posql_db/run_example.sh - - name: Run posql_db example (Without Blitzar) - run: bash crates/proof-of-sql/examples/posql_db/run_example.sh --no-default-features --features="rayon" diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml index 7226c09d3..ea430158b 100644 --- a/.github/workflows/lint-and-test.yml +++ b/.github/workflows/lint-and-test.yml @@ -106,6 +106,18 @@ jobs: run: | cargo test proof_primitive::dory::dory_compute_commitments_test --no-default-features --features="std" && \ cargo test proof_primitive::dory::dynamic_dory_compute_commitments_test --no-default-features --features="std" + - name: Run hello_world example (With Blitzar) + run: cargo run --example hello_world --features="test" + - name: Run hello_world example (Without Blitzar and With Rayon) + run: cargo run --example hello_world --no-default-features --features="rayon test" + - name: Run hello_world example (Without Blitzar and Without Rayon) + run: cargo run --example hello_world --no-default-features --features="test" + - name: Run space example + run: cargo run --example space + - name: Run posql_db example (With Blitzar) + run: bash crates/proof-of-sql/examples/posql_db/run_example.sh + - name: Run posql_db example (Without Blitzar) + run: bash crates/proof-of-sql/examples/posql_db/run_example.sh --no-default-features --features="rayon" clippy: name: Clippy runs-on: large-8-core-32gb-22-04