Skip to content

Commit ca3abaa

Browse files
authored
fix: bb-only-change fix e2e build instability (#9441)
- get rid of misc ci exemption from ci builds, too wordy - make things that imply a build not part of the non-barretenberg-core build set
1 parent 6f4892c commit ca3abaa

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

.github/workflows/ci.yml

+14-6
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ jobs:
5151
barretenberg-cpp: ${{ steps.filter.outputs.barretenberg-cpp }}
5252
noir: ${{ steps.filter.outputs.noir }}
5353
noir-projects: ${{ steps.filter.outputs.noir-projects }}
54+
yarn-project: ${{ steps.filter.outputs.yarn-project }}
5455
txe: ${{ steps.filter.outputs.txe }}
5556
l1-contracts: ${{ steps.filter.outputs.l1-contracts }}
5657
non-docs: ${{ steps.filter.outputs.non-docs }}
@@ -95,6 +96,8 @@ jobs:
9596
- 'l1-contracts/**'
9697
noir-projects:
9798
- 'noir-projects/**'
99+
yarn-project:
100+
- 'yarn-project/**'
98101
txe:
99102
- 'yarn-project/txe/**'
100103
non-barretenberg-cpp:
@@ -155,7 +158,7 @@ jobs:
155158
# prepare images locally, tagged by commit hash
156159
- name: "Build E2E Image"
157160
timeout-minutes: 40
158-
if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
161+
if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master'
159162
run: |
160163
earthly-ci ./yarn-project+export-e2e-test-images
161164
# We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end
@@ -184,7 +187,7 @@ jobs:
184187
# all the non-bench end-to-end integration tests for aztec
185188
e2e:
186189
needs: [build, configure]
187-
if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
190+
if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'e2e')
188191
runs-on: ubuntu-20.04
189192
strategy:
190193
fail-fast: false
@@ -216,7 +219,7 @@ jobs:
216219
# all the benchmarking end-to-end integration tests for aztec (not required to merge)
217220
bench-e2e:
218221
needs: [build, configure]
219-
if: needs.build.outputs.bench_list != '[]' && ((needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench'))
222+
if: needs.build.outputs.bench_list != '[]' && ((needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' || contains(github.event.pull_request.labels.*.name, 'bench'))
220223
runs-on: ubuntu-20.04
221224
strategy:
222225
fail-fast: false
@@ -525,7 +528,7 @@ jobs:
525528
noir-examples:
526529
needs: [build, configure]
527530
runs-on: ${{ needs.configure.outputs.username }}-x86
528-
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true'
531+
if: needs.configure.outputs.noir == 'true'
529532
steps:
530533
- uses: actions/checkout@v4
531534
with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -552,7 +555,7 @@ jobs:
552555
noir-projects:
553556
needs: [build, configure]
554557
runs-on: ${{ needs.configure.outputs.username }}-x86
555-
if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true'
558+
if: needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true'
556559
steps:
557560
- uses: actions/checkout@v4
558561
with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -581,6 +584,7 @@ jobs:
581584

582585
yarn-project-formatting:
583586
needs: [build, configure]
587+
if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master'
584588
runs-on: ${{ needs.configure.outputs.username }}-x86
585589
steps:
586590
- uses: actions/checkout@v4
@@ -594,6 +598,7 @@ jobs:
594598

595599
yarn-project-test:
596600
needs: [build, configure]
601+
if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master'
597602
runs-on: ${{ needs.configure.outputs.username }}-x86
598603
steps:
599604
- uses: actions/checkout@v4
@@ -608,6 +613,7 @@ jobs:
608613
prover-client-test:
609614
needs: [build, configure]
610615
runs-on: ${{ needs.configure.outputs.username }}-x86
616+
if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master'
611617
steps:
612618
- uses: actions/checkout@v4
613619
with: { ref: "${{ env.GIT_COMMIT }}" }
@@ -621,6 +627,7 @@ jobs:
621627
# proving disabled
622628
network-test:
623629
needs: [build, configure]
630+
if: needs.configure.outputs.yarn-project == 'true'
624631
runs-on: ${{ needs.configure.outputs.username }}-x86
625632
strategy:
626633
max-parallel: 1
@@ -642,6 +649,7 @@ jobs:
642649
# note: proving disabled
643650
kind-network-test:
644651
needs: [build, configure]
652+
if: needs.configure.output.yarn-project == 'true'
645653
runs-on: ${{ needs.configure.outputs.username }}-x86
646654
strategy:
647655
fail-fast: false
@@ -797,7 +805,7 @@ jobs:
797805

798806
protocol-circuits-gates-report:
799807
needs: [build, configure]
800-
if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true'
808+
if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true'
801809
runs-on: ${{ needs.configure.outputs.username }}-x86
802810
permissions:
803811
pull-requests: write

0 commit comments

Comments
 (0)