Skip to content

chore: ci improvements #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrlc03 merged 5 commits into from
Mar 25, 2026
Merged

chore: ci improvements #1469

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b008d73
chore: ci improvements
ctrlc03 Mar 23, 2026
a7c319b
fix(ci): align ciphernode docker and CRISP unit matrix
cedoor Mar 25, 2026
5ebaa94
perf(ci): gate crisp_unit steps by matrix test suite
cedoor Mar 25, 2026
014f684
test: enable proof aggregation for integration tests
cedoor Mar 25, 2026
6665c67
ci: add sdk and contracts conditions to sdk download step
cedoor Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 34 additions & 25 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
echo "zk=$(any $FORCE $RUST $CIRCUITS $CI)" >> $GITHUB_OUTPUT
echo "contracts=$(any $FORCE $CONTRACTS $CI)" >> $GITHUB_OUTPUT
echo "docker_support=$(any $FORCE $DOCKER $CI)" >> $GITHUB_OUTPUT
echo "docker_ciphernode=$(any $FORCE $RUST $CONTRACTS $DOCKER $CI)" >> $GITHUB_OUTPUT
echo "docker_ciphernode=$(any $FORCE $RUST $DOCKER $CI $CONTRACTS)" >> $GITHUB_OUTPUT
echo "net=$(any $FORCE $INTEGRATION $CI)" >> $GITHUB_OUTPUT
echo "init=$(any $FORCE $TEMPLATES $RUST $CONTRACTS $CI)" >> $GITHUB_OUTPUT
echo "build_e3_support_dev=$(any $FORCE $TEMPLATES $RUST $CONTRACTS $SDK $CI)" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -472,9 +472,8 @@ jobs:
labels: [enclave-ci-runner]
strategy:
matrix:
# TODO removed base test for now
test-suite: [base, persist]
fail-fast: false
fail-fast: true
steps:
- name: 'Check out the repo'
uses: 'actions/checkout@v6'
Expand Down Expand Up @@ -537,7 +536,7 @@ jobs:
needs: [detect_changes]
if: needs.detect_changes.outputs.build_enclave_cli == 'true'
timeout-minutes: 20
runs-on:
runs-on:
group: enclave-ci
labels: [enclave-ci-runner]
permissions:
Expand Down Expand Up @@ -583,79 +582,89 @@ jobs:
if: needs.detect_changes.outputs.crisp == 'true'
timeout-minutes: 30
runs-on: 'ubuntu-latest'
strategy:
matrix:
include:
- test-suite: test:circuits
command: pnpm test:circuits
- test-suite: test:sdk
command: pnpm test:sdk
- test-suite: test:contracts
command: pnpm test:contracts
- test-suite: cargo test
command: cargo test
fail-fast: false
Comment thread
cedoor marked this conversation as resolved.
steps:
- uses: actions/checkout@v6
with:
submodules: recursive

- name: Cache Rust dependencies
if: matrix.test-suite == 'cargo test'
uses: ./.github/actions/cache-dependencies
with:
cargo-lock-path: examples/CRISP/Cargo.lock
rust-target-path: examples/CRISP/target/

- name: Install Rust
if: matrix.test-suite == 'cargo test'
uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ env.RUST_TOOLCHAIN }}

- name: Install Foundry
if: matrix.test-suite == 'cargo test'
uses: foundry-rs/foundry-toolchain@v1

- name: Install solc
if: matrix.test-suite == 'cargo test'
run: |
sudo add-apt-repository ppa:ethereum/ethereum \
&& sudo apt-get update -y \
&& sudo apt-get install -y solc

- name: Install Nargo
if: matrix.test-suite == 'test:circuits'
uses: noir-lang/noirup@v0.1.4
with:
toolchain: ${{ env.NOIR_TOOLCHAIN }}

- name: Setup pnpm
if: matrix.test-suite != 'cargo test'
uses: pnpm/action-setup@v4

- name: Setup Node.js
if: matrix.test-suite != 'cargo test'
uses: actions/setup-node@v4
with:
node-version: ${{ env.NODE_VERSION }}
cache: 'pnpm'
cache-dependency-path: pnpm-lock.yaml

- name: Install dependencies
if: matrix.test-suite != 'cargo test'
working-directory: .
run: pnpm install --frozen-lockfile

- name: Compile Enclave contracts
if: matrix.test-suite == 'test:contracts'
working-directory: .
run: pnpm evm:build

- name: Install solc
run: |
sudo add-apt-repository ppa:ethereum/ethereum \
&& sudo apt-get update -y \
&& sudo apt-get install -y solc

- name: Run Rust tests
working-directory: ./examples/CRISP
run: 'cargo test'

- name: Download Crisp SDK artifacts
if: matrix.test-suite == 'test:sdk' || matrix.test-suite == 'test:contracts'
uses: actions/download-artifact@v4
with:
name: crisp-sdk-artifacts
path: .

- name: Run Noir tests
working-directory: ./examples/CRISP
run: 'pnpm test:circuits'

- name: Run JavaScript tests
- name: Run ${{ matrix.test-suite }}
working-directory: ./examples/CRISP
run: 'pnpm test:sdk'

- name: Run Solidity tests
working-directory: ./examples/CRISP
run: 'pnpm test:contracts'
run: ${{ matrix.command }}

crisp_e2e:
needs: [detect_changes, build_enclave_cli, build_crisp_sdk]
if: needs.detect_changes.outputs.crisp == 'true'
if: needs.detect_changes.outputs.crisp == 'true'
timeout-minutes: 45
runs-on:
group: enclave-ci
Expand Down
Loading