Skip to content

Commit f7236ea

Browse files
ci: remove merge-queue and consolidate CUDA base tests (#2074)
The merge queue is unstable and blocking PR merges due to not all jobs completing from workflow API flakiness or runner flakiness. We will go back to merging to main and running workflows on push to main for now. Additionally, I consolidated the primitives, vm, recursion CUDA tests to one runner to save some runners (and possibly compile time). --------- Co-authored-by: Copilot <[email protected]>
1 parent 3f9c8c5 commit f7236ea

18 files changed

+110
-35
lines changed

.github/workflows/base-tests.cuda.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Base Tests (CUDA)
2+
# Consolidate non-extension tests to use fewer CUDA runners
3+
4+
on:
5+
workflow_call:
6+
push:
7+
branches: ["main"]
8+
pull_request:
9+
branches: ["**"]
10+
paths:
11+
- "crates/circuits/**"
12+
- "crates/vm/**"
13+
- "extensions/native/compiler/**"
14+
- "extensions/native/recursion/**"
15+
- "Cargo.toml"
16+
- ".github/workflows/base-tests.cuda.yml"
17+
18+
concurrency:
19+
group: ${{ github.workflow_ref }}-base-tests-cuda-${{ github.event.pull_request.number || github.sha }}
20+
cancel-in-progress: true
21+
22+
env:
23+
CARGO_TERM_COLOR: always
24+
OPENVM_FAST_TEST: "1"
25+
26+
jobs:
27+
tests-cuda:
28+
runs-on:
29+
- runs-on=${{ github.run_id }}-base-tests-cuda-${{ github.run_attempt }}/runner=test-gpu-nvidia
30+
31+
steps:
32+
- uses: runs-on/action@v2
33+
- uses: actions/checkout@v5
34+
- run: | # avoid cross-device link error
35+
rustup component remove clippy || true
36+
rm -rf ~/.rustup/toolchains/stable-x86_64-unknown-linux-gnu || true
37+
- uses: dtolnay/rust-toolchain@stable
38+
- uses: Swatinem/rust-cache@v2
39+
with:
40+
cache-on-failure: true
41+
- uses: taiki-e/install-action@nextest
42+
43+
- name: Check CUDA status and set environment variables
44+
run: |
45+
nvcc --version
46+
echo "NEXTEST_ARGS=cuda --features parallel,cuda,touchemall" >> $GITHUB_ENV
47+
48+
- name: Run tests for primitives
49+
working-directory: crates/circuits/primitives
50+
run: |
51+
cargo nextest run ${{ env.NEXTEST_ARGS }}
52+
53+
- name: Run tests for poseidon2-air
54+
working-directory: crates/circuits/poseidon2-air
55+
run: |
56+
cargo nextest run ${{ env.NEXTEST_ARGS }}
57+
58+
- name: Run vm crate tests
59+
working-directory: crates/vm
60+
run: |
61+
cargo nextest run ${{ env.NEXTEST_ARGS }}
62+
63+
- name: Run recursion crate tests
64+
working-directory: extensions/native/recursion
65+
run: |
66+
cargo nextest run --features cuda

.github/workflows/benchmarks-execute.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: "Execution benchmarks"
22

33
on:
44
workflow_call:
5+
push:
6+
branches: ["main"]
57
pull_request:
68
types: [opened, synchronize, reopened, labeled]
79
branches: ["**"]

.github/workflows/benchmarks.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,22 @@ on:
99
type: boolean
1010
default: false
1111
push:
12-
branches: ["feat/new-execution"]
12+
branches: ["main"]
13+
paths:
14+
- "benchmarks/prove/**"
15+
- "benchmarks/guest/**"
16+
- "crates/**"
17+
- "extensions/**"
18+
- ".github/workflows/benchmark-call.yml"
19+
- ".github/workflows/benchmarks.yml"
20+
- "Cargo.toml"
1321
pull_request:
1422
types: [opened, synchronize, reopened, labeled]
1523
branches: ["**"]
1624
paths:
1725
- "benchmarks/prove/**"
18-
- "crates/circuits/**"
19-
- "crates/toolchain/**"
20-
- "crates/prof/**"
21-
- "crates/sdk/**"
22-
- "crates/vm/**"
26+
- "benchmarks/guest/**"
27+
- "crates/**"
2328
- "extensions/**"
2429
- ".github/workflows/benchmark-call.yml"
2530
- ".github/workflows/benchmarks.yml"

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build Workspace
22

33
on:
4+
push:
5+
branches: ["main"]
46
pull_request:
57
branches: ["**"]
68
workflow_call:

.github/workflows/cli.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: OpenVM CLI Tests
22

33
on:
44
push:
5+
branches: ["main"]
56
tags: ["v*"]
67
pull_request:
78
branches: ["**"]

.github/workflows/docs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Build and Serve Crate Docs
33
on:
44
workflow_call:
55
push:
6+
branches: ["main"]
67
tags:
78
- v*.*.*
89
pull_request:

.github/workflows/extension-tests.cuda.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Extension Tests (CUDA)
22

33
on:
44
workflow_call:
5+
push:
6+
branches: ["main"]
57
pull_request:
68
branches: ["**"]
79
paths:

.github/workflows/extension-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Extension Tests
22

33
on:
44
workflow_call:
5+
push:
6+
branches: ["main"]
57
pull_request:
68
branches: ["**"]
79
paths:

.github/workflows/guest-lib-tests.cuda.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Guest Library Tests (CUDA)
22

33
on:
44
workflow_call:
5+
push:
6+
branches: ["main"]
57
pull_request:
68
branches: ["**"]
79
paths:

.github/workflows/guest-lib-tests.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Guest Library Tests
22

33
on:
44
workflow_call:
5+
push:
6+
branches: ["main"]
57
pull_request:
68
branches: ["**"]
79
paths:

0 commit comments

Comments
 (0)