Skip to content

Commit 1cce66d

Browse files
authored
fix: fix oops (#14358)
Please read [contributing guidelines](CONTRIBUTING.md) and remove this line.
1 parent a923125 commit 1cce66d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/ci3.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
merge_group: {}
1515

1616
concurrency:
17-
group: ${{ github.event.merge_group.head_ref || github.ref_name }}
17+
group: ci3-${{ github.event.merge_group.head_ref || github.ref_name }}
1818
cancel-in-progress: true
1919

2020
jobs:
@@ -82,11 +82,11 @@ jobs:
8282
fi
8383
8484
- name: Download benchmarks
85-
if: github.event_name == 'merge_group' || contains(github.event.pull_request.labels.*.name, 'ci-full')
85+
if: github.event_name == 'merge_group'
8686
run: ./ci.sh gh-bench
8787

8888
- name: Upload benchmarks
89-
if: github.event_name == 'merge_group' || contains(github.event.pull_request.labels.*.name, 'ci-full')
89+
if: github.event_name == 'merge_group'
9090
uses: benchmark-action/github-action-benchmark@4de1bed97a47495fc4c5404952da0499e31f5c29
9191
with:
9292
name: Aztec Benchmarks

ci3/parallelise_strict

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ cd $root
77

88
if [ -z "${1:-}" ]; then
99
num_cpus=$(get_num_cpus)
10-
jobs=$((num_cpus / 2))
10+
num_cpus=$((num_cpus / 2))
1111
else
12-
jobs=$(get_num_cpus_max ${1:-})
12+
num_cpus=$(get_num_cpus_max ${1:-})
1313
fi
1414

1515
[ -t 1 ] && no_term=0 || no_term=1

0 commit comments

Comments
 (0)