From 03ae38b7bbad9c51d0acb19e7136452f8ad3afbc Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 17:33:56 -0400 Subject: [PATCH 1/7] fix: e2e build issues --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba1846d355af..ef1c107a7792 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: timeout-minutes: 40 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' run: | - earthly-ci ./yarn-project+export-e2e-test-images + flock /var/lock/image-build earthly-ci ./yarn-project+export-e2e-test-images # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end # (Note ARM uses just 2 tests as a smoketest) - name: Create list of non-bench end-to-end jobs @@ -206,7 +206,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: flock /var/lock/image-build cd ../l1-artifacts && yarn generate && yarn build run: | set -eux cd ./yarn-project/end-to-end/ @@ -238,7 +238,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: flock /var/lock/image-build cd ../l1-artifacts && yarn generate && yarn build tester_ttl: 40 run: | set -eux @@ -621,6 +621,7 @@ jobs: # proving disabled network-test: needs: [build, configure] + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: max-parallel: 1 @@ -642,6 +643,7 @@ jobs: # note: proving disabled kind-network-test: needs: [build, configure] + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: fail-fast: false @@ -667,7 +669,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images run: | sudo shutdown -P 60 # extend ttl cd yarn-project/end-to-end From a981a14ed7af2e2cbd0e57ecc4d8ac47064296df Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 17:35:06 -0400 Subject: [PATCH 2/7] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ef1c107a7792..f0eb73863655 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -206,7 +206,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: flock /var/lock/image-build cd ../l1-artifacts && yarn generate && yarn build + builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images run: | set -eux cd ./yarn-project/end-to-end/ @@ -238,7 +238,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: flock /var/lock/image-build cd ../l1-artifacts && yarn generate && yarn build + builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images tester_ttl: 40 run: | set -eux From a54d242e9905b8471743dc3cfb83d126e889222c Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 17:51:52 -0400 Subject: [PATCH 3/7] Update ci.yml --- .github/workflows/ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0eb73863655..62b021849bbe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,7 @@ jobs: # prepare images locally, tagged by commit hash - name: "Build E2E Image" timeout-minutes: 40 - 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' + if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' run: | flock /var/lock/image-build earthly-ci ./yarn-project+export-e2e-test-images # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end @@ -184,7 +184,7 @@ jobs: # all the non-bench end-to-end integration tests for aztec e2e: needs: [build, configure] - 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') + 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') runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -216,7 +216,7 @@ jobs: # all the benchmarking end-to-end integration tests for aztec (not required to merge) bench-e2e: needs: [build, configure] - 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')) + 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')) runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -594,6 +594,7 @@ jobs: yarn-project-test: needs: [build, configure] + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 steps: - uses: actions/checkout@v4 @@ -608,6 +609,7 @@ jobs: prover-client-test: needs: [build, configure] runs-on: ${{ needs.configure.outputs.username }}-x86 + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' steps: - uses: actions/checkout@v4 with: { ref: "${{ env.GIT_COMMIT }}" } @@ -621,7 +623,7 @@ jobs: # proving disabled network-test: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: max-parallel: 1 @@ -643,7 +645,7 @@ jobs: # note: proving disabled kind-network-test: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: fail-fast: false @@ -799,7 +801,7 @@ jobs: protocol-circuits-gates-report: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-misc-ci == 'true' + if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 permissions: pull-requests: write From 17b3b2a29707381cf590dfbabc36bb8f7c0ecaff Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 17:56:47 -0400 Subject: [PATCH 4/7] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62f324d1f1b3..2d0fd6b35498 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -157,7 +157,7 @@ jobs: timeout-minutes: 40 if: (needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true') || github.ref_name == 'master' run: | - flock /var/lock/image-build earthly-ci ./yarn-project+export-e2e-test-images + earthly-ci ./yarn-project+export-e2e-test-images # We base our e2e list used in e2e-x86 off the targets in ./yarn-project/end-to-end # (Note ARM uses just 2 tests as a smoketest) - name: Create list of non-bench end-to-end jobs @@ -206,7 +206,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images run: | set -eux cd ./yarn-project/end-to-end/ @@ -238,7 +238,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images tester_ttl: 40 run: | set -eux @@ -671,7 +671,7 @@ jobs: # if they fail to copy, it will try to build them on the tester and fail builder_images_to_copy: aztecprotocol/aztec:${{ env.GIT_COMMIT }} aztecprotocol/end-to-end:${{ env.GIT_COMMIT }} # command to produce the images in case they don't exist - builder_command: flock /var/lock/image-build scripts/earthly-ci ./yarn-project+export-e2e-test-images + builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images tester_ttl: 60 run: | cd yarn-project/end-to-end From 6ec18ff7fef7cf1b6235aec7284d280077e8ccde Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 18:00:17 -0400 Subject: [PATCH 5/7] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2d0fd6b35498..b363c0d67c0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -552,7 +552,7 @@ jobs: noir-projects: needs: [build, configure] runs-on: ${{ needs.configure.outputs.username }}-x86 - if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true' + if: needs.configure.outputs.non-barretenberg-cpp == 'true' || needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true' steps: - uses: actions/checkout@v4 with: { ref: "${{ env.GIT_COMMIT }}" } From 5f24fd4e82dd615fce429e7e71dbdc2d693e46c0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 18:08:07 -0400 Subject: [PATCH 6/7] Update ci.yml --- .github/workflows/ci.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b363c0d67c0b..d5c3334df281 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,6 +51,7 @@ jobs: barretenberg-cpp: ${{ steps.filter.outputs.barretenberg-cpp }} noir: ${{ steps.filter.outputs.noir }} noir-projects: ${{ steps.filter.outputs.noir-projects }} + yarn-project: ${{ steps.filter.outputs.yarn-project }} txe: ${{ steps.filter.outputs.txe }} l1-contracts: ${{ steps.filter.outputs.l1-contracts }} non-docs: ${{ steps.filter.outputs.non-docs }} @@ -95,6 +96,8 @@ jobs: - 'l1-contracts/**' noir-projects: - 'noir-projects/**' + yarn-project: + - 'yarn-project/**' txe: - 'yarn-project/txe/**' non-barretenberg-cpp: @@ -525,7 +528,7 @@ jobs: noir-examples: needs: [build, configure] runs-on: ${{ needs.configure.outputs.username }}-x86 - if: needs.configure.outputs.barretenberg == 'true' || needs.configure.outputs.noir == 'true' + if: needs.configure.outputs.noir == 'true' steps: - uses: actions/checkout@v4 with: { ref: "${{ env.GIT_COMMIT }}" } @@ -581,6 +584,7 @@ jobs: yarn-project-formatting: needs: [build, configure] + if: needs.configure.outputs.yarn-project == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 steps: - uses: actions/checkout@v4 @@ -623,7 +627,7 @@ jobs: # proving disabled network-test: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.outputs.yarn-project == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: max-parallel: 1 @@ -645,7 +649,7 @@ jobs: # note: proving disabled kind-network-test: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.output.yarn-project == 'true' runs-on: ${{ needs.configure.outputs.username }}-x86 strategy: fail-fast: false From 51ea9c8d65cb33ad45609030cfc2e805b6e4bab6 Mon Sep 17 00:00:00 2001 From: ludamad Date: Fri, 25 Oct 2024 18:14:05 -0400 Subject: [PATCH 7/7] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c3334df281..84b63b632d16 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -555,7 +555,7 @@ jobs: noir-projects: needs: [build, configure] runs-on: ${{ needs.configure.outputs.username }}-x86 - if: needs.configure.outputs.non-barretenberg-cpp == 'true' || needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true' + if: needs.configure.outputs.noir == 'true' || needs.configure.outputs.noir-projects == 'true' || needs.configure.outputs.txe == 'true' steps: - uses: actions/checkout@v4 with: { ref: "${{ env.GIT_COMMIT }}" } @@ -584,7 +584,7 @@ jobs: yarn-project-formatting: needs: [build, configure] - if: needs.configure.outputs.yarn-project == 'true' + if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' runs-on: ${{ needs.configure.outputs.username }}-x86 steps: - uses: actions/checkout@v4 @@ -598,7 +598,7 @@ jobs: yarn-project-test: needs: [build, configure] - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' runs-on: ${{ needs.configure.outputs.username }}-x86 steps: - uses: actions/checkout@v4 @@ -613,7 +613,7 @@ jobs: prover-client-test: needs: [build, configure] runs-on: ${{ needs.configure.outputs.username }}-x86 - if: needs.configure.outputs.non-docs == 'true' && needs.configure.outputs.non-barretenberg-cpp == 'true' + if: needs.configure.outputs.yarn-project == 'true' || github.ref_name == 'master' steps: - uses: actions/checkout@v4 with: { ref: "${{ env.GIT_COMMIT }}" }