Skip to content
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

Jump to bottom

ci: Transition to self-hosted runners #598

Merged
merged 2 commits into from
Aug 14, 2023
Merged

ci: Transition to self-hosted runners #598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
280cf87
Reorganize CI to minimize unneeded jobs
samuelburnham Aug 9, 2023
44605c4
Add back arm64 in matrix job
samuelburnham Aug 13, 2023
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
226 changes: 11 additions & 215 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ setup-env: &setup-env
RUST_LOG: info

executors:
default:
machine:
image: ubuntu-2004:202101-01
working_directory: ~/lurk
resource_class: xlarge
arm64:
machine:
image: ubuntu-2004:202101-01
Expand Down Expand Up @@ -99,191 +94,47 @@ commands:
cargo --version
rustc --version

save_rustup_cache:
steps:
- save_cache:
name: "Save rustup cache"
key: cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}
paths:
- "~/.cargo"
- "~/.rustup"

restore_rustup_cache:
steps:
- restore_cache:
keys:
- cargo-v2-{{ checksum "rust-toolchain" }}-{{ checksum "Cargo.toml" }}-{{ checksum "Cargo.lock" }}-{{ arch }}

install_gpu_deps:
steps:
- run: sudo apt update && sudo apt install -y ocl-icd-opencl-dev curl build-essential

jobs:
cargo_fetch:
executor: default
environment: *setup-env
test:
parameters:
os:
type: executor
executor: << parameters.os >>
steps:
- checkout
- run:
name: Update submodules
command: |
git submodule update --init --recursive
- restore_rustup_cache
- set_env_path
- set_versions_n_runners
- run: cargo fetch
- run: rm -rf .git
- persist_to_workspace:
root: ~/
paths:
- lurk
- save_rustup_cache

linux_release:
executor: default
environment: *setup-env
steps:
- checkout
- attach_workspace:
at: "~/"
- restore_rustup_cache
- set_env_path
- setup-sccache
- install_gpu_deps
- restore-sccache-cache
- run:
name: Linux Tests
command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci --run-ignored ignored-only -E 'all() - test(groth16::tests::outer_prove_recursion) - test(test_make_fcomm_examples) - test(test_functional_commitments_demo) - test(test_chained_functional_commitments_demo)'
- run:
name: Benches build successfully
command: cargo bench --no-run --profile dev-ci
- run:
name: Linux Doc Tests
command: cargo test --doc --workspace --profile dev-ci
- save-sccache-cache
- run:
name: Print sccache stats
command: sccache -s

linux_exhaustive:
executor: default
environment: *setup-env
steps:
- checkout
- attach_workspace:
at: "~/"
- restore_rustup_cache
- set_env_path
- install_gpu_deps
- restore-sccache-cache
- run:
name: Linux Tests
command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci --run-ignored all
- run:
name: Benches build successfully
command: cargo bench --no-run --profile dev-ci
- run:
name: Linux Doc Tests
command: cargo test --doc --workspace --profile dev-ci
- save-sccache-cache
- run:
name: Print sccache stats
command: sccache -s

arm64:
executor: arm64
environment: *setup-env
steps:
- checkout
- run:
name: Update submodules
command: |
git submodule update --init --recursive
- attach_workspace:
at: "~/"
- set_versions_n_runners
- set_env_path
- install_gpu_deps
- setup-sccache
- restore-sccache-cache
- run:
name: Arm64 Tests
command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci
no_output_timeout: 120m
- run:
name: Benches build successfully
command: cargo bench --no-run --profile dev-ci
- run:
name: Arm64 Doc Tests
command: cargo test --doc --workspace --profile dev-ci
- save-sccache-cache
- run:
name: Print sccache stats
command: sccache -s

mac:
executor: darwin
environment: *setup-env
steps:
- checkout
- run:
name: Update submodules
command: git submodule update --init --recursive
- attach_workspace:
at: "~/"
- set_versions_n_runners
- set_env_path
- setup-sccache
- restore-sccache-cache
- run:
name: MacOS Tests
name: Run cargo tests
command: cargo nextest run --profile ci --workspace --cargo-profile dev-ci
no_output_timeout: 120m
- run:
name: Benches build successfully
command: cargo bench --no-run --profile dev-ci
- run:
name: MacOS Doc Tests
name: Doc Tests
command: cargo test --doc --workspace --profile dev-ci
- save-sccache-cache
- run:
name: Print sccache stats
command: sccache -s

clippy:
executor: default
environment: *setup-env
steps:
- checkout
- set_env_path
- attach_workspace:
at: "~/"
- restore_rustup_cache
- run: cargo clippy --all -- -D warnings

rustfmt:
executor: default
environment: *setup-env
steps:
- checkout
- set_env_path
- attach_workspace:
at: "~/"
- restore_rustup_cache
- run: cargo fmt --all -- --check

workflows:
test-all:
jobs:
- cargo_fetch:
filters:
branches:
ignore:
- gh-pages
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
- arm64:
- test:
matrix:
parameters:
os: [arm64, darwin]
filters:
branches:
ignore:
Expand All @@ -292,58 +143,3 @@ workflows:
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
- mac:
filters:
branches:
ignore:
- master
- gh-pages
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
- linux_release:
requires:
- cargo_fetch
filters:
branches:
ignore:
- master
- gh-pages
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
- rustfmt:
requires:
- cargo_fetch
filters:
branches:
ignore:
- master
- gh-pages
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
- clippy:
requires:
- cargo_fetch
filters:
branches:
ignore:
- master
- gh-pages
- staging.tmp
- trying.tmp
- staging-squash-merge.tmp
nightly:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- master
jobs:
- cargo_fetch
- linux_exhaustive:
requires:
- cargo_fetch
1 change: 1 addition & 0 deletions .github/workflows/pr-bench.yml → .github/workflows/bench_pr_comment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Creates a PR benchmark comment with a comparison to master
name: Benchmark pull requests
on:
issue_comment:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-test.yml → .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lurk CI tests
name: CI tests

on:
merge_group:
Expand Down Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Linux Gadget Tests w/o debug assertions
run: |
cargo nextest run --profile ci --workspace --cargo-profile dev-no-assertions -E 'test(circuit::gadgets)'

misc:
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -77,7 +77,7 @@ jobs:
run: cargo build --benches
- name: Doctests
run: |
cargo test --doc
cargo test --doc --workspace --profile dev-ci

clippy:
runs-on: ubuntu-latest
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/ci_ignored.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Run ignored tests only when attempting to merge
name: Linux ignored tests

on:
merge_group:

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
linux_ignored:
runs-on: [self-hosted, test]
env:
RUSTFLAGS: -D warnings
steps:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
- uses: taiki-e/install-action@nextest
- uses: Swatinem/rust-cache@v2
- name: Linux Tests
run: |
cargo nextest run --profile ci --workspace --cargo-profile dev-ci --run-ignored ignored-only -E 'all() - test(groth16::tests::outer_prove_recursion) - test(test_make_fcomm_examples) - test(test_functional_commitments_demo) - test(test_chained_functional_commitments_demo)'
Loading
Loading