From 0e5337c15daaf0951bf5cc4439c599c84b01e3e1 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 17:46:50 +0000 Subject: [PATCH 01/13] Update merge check --- .github/workflows/ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 369074f09b9c..20eece51f4f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -358,6 +358,10 @@ jobs: - yarn-project-formatting - yarn-project-test - prover-client-test + - bb-js-test + - barretenberg-acir-tests-bb-js + - barretenberg-acir-tests-bb + - barretenberg-acir-tests-sol if: always() steps: - run: | @@ -366,21 +370,24 @@ jobs: echo "bb-bench status: ${{ needs.bb-bench.result }}" echo "yarn-project-formatting status: ${{ needs.yarn-project-formatting.result }}" echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}" - if [[ "${{ needs.e2e.result }}" != 'success' || "${{ needs.bb-native-tests.result }}" != 'success' || "${{ needs.bb-bench.result }}" != 'success' || "${{ needs.yarn-project-formatting.result }}" != 'success' || "${{ needs.yarn-project-test.result }}" != 'success' ]]; then + if [[ "${{ needs.barretenberg-acir-tests-sol.result }}" != 'success' || "${{ needs.barretenberg-acir-tests-bb.result }}" != 'success' || "${{ needs.barretenberg-acir-tests-bb-js.result }}" != 'success' || "${{ needs.bb-js-test.result }}" != 'success' || "${{ needs.prover-client-test.result }}" != 'success' || "${{ needs.e2e.result }}" != 'success' || "${{ needs.bb-native-tests.result }}" != 'success' || "${{ needs.bb-bench.result }}" != 'success' || "${{ needs.yarn-project-formatting.result }}" != 'success' || "${{ needs.yarn-project-test.result }}" != 'success' ]]; then echo "Pull request merging not allowed due to failures." exit 1 fi echo "Pull request merging now allowed." notify: - needs: - [ + needs: [ e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test, prover-client-test, + - bb-js-test + - barretenberg-acir-tests-bb-js + - barretenberg-acir-tests-bb + - barretenberg-acir-tests-sol, ] runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/master' && failure() }} From 0c5be974af0083931f00d0bde7cf8800cdeb8944 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 17:57:41 +0000 Subject: [PATCH 02/13] Fixed formatting --- .github/workflows/ci.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 20eece51f4f1..8360ef4aea8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -377,17 +377,18 @@ jobs: echo "Pull request merging now allowed." notify: - needs: [ + needs: + [ e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test, prover-client-test, - - bb-js-test - - barretenberg-acir-tests-bb-js - - barretenberg-acir-tests-bb - - barretenberg-acir-tests-sol, + bb-js-test, + barretenberg-acir-tests-bb-js, + barretenberg-acir-tests-bb, + barretenberg-acir-tests-sol, ] runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/master' && failure() }} From 18bef81e2d77fdb874c5e9b7a98de360ef61f23c Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 18:09:42 +0000 Subject: [PATCH 03/13] Update --- .github/workflows/ci.yml | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8360ef4aea8f..ea9d27158ad0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -352,16 +352,18 @@ jobs: merge-check: runs-on: ubuntu-latest needs: - - e2e - - bb-native-tests - - bb-bench - - yarn-project-formatting - - yarn-project-test - - prover-client-test - - bb-js-test - - barretenberg-acir-tests-bb-js - - barretenberg-acir-tests-bb - - barretenberg-acir-tests-sol + [ + e2e, + bb-native-tests, + bb-bench, + yarn-project-formatting, + yarn-project-test, + prover-client-test, + bb-js-test, + barretenberg-acir-tests-bb-js, + barretenberg-acir-tests-bb, + barretenberg-acir-tests-sol, + ] if: always() steps: - run: | @@ -370,10 +372,13 @@ jobs: echo "bb-bench status: ${{ needs.bb-bench.result }}" echo "yarn-project-formatting status: ${{ needs.yarn-project-formatting.result }}" echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}" - if [[ "${{ needs.barretenberg-acir-tests-sol.result }}" != 'success' || "${{ needs.barretenberg-acir-tests-bb.result }}" != 'success' || "${{ needs.barretenberg-acir-tests-bb-js.result }}" != 'success' || "${{ needs.bb-js-test.result }}" != 'success' || "${{ needs.prover-client-test.result }}" != 'success' || "${{ needs.e2e.result }}" != 'success' || "${{ needs.bb-native-tests.result }}" != 'success' || "${{ needs.bb-bench.result }}" != 'success' || "${{ needs.yarn-project-formatting.result }}" != 'success' || "${{ needs.yarn-project-test.result }}" != 'success' ]]; then - echo "Pull request merging not allowed due to failures." - exit 1 - fi + for need in "${needs[@]}" + do + if [ "${{ need.result }}" != 'success' ]; then + echo "$need failed, merging not allowed" + exit 1 + fi + done echo "Pull request merging now allowed." notify: From 4cf4030ecadb2e326e1fce3395e090e8d8247ed3 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 18:30:07 +0000 Subject: [PATCH 04/13] Another approach --- .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 ea9d27158ad0..55bfa830506d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -374,7 +374,7 @@ jobs: echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}" for need in "${needs[@]}" do - if [ "${{ need.result }}" != 'success' ]; then + if [ "${{ ${need}.result }}" != 'success' ]; then echo "$need failed, merging not allowed" exit 1 fi From 5345711ba9f2af222f36b1c71af3dd219fe489b7 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 18:33:51 +0000 Subject: [PATCH 05/13] Another attempt --- .github/workflows/ci.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 55bfa830506d..7f6a55ed09cc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -372,13 +372,10 @@ jobs: echo "bb-bench status: ${{ needs.bb-bench.result }}" echo "yarn-project-formatting status: ${{ needs.yarn-project-formatting.result }}" echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}" - for need in "${needs[@]}" - do - if [ "${{ ${need}.result }}" != 'success' ]; then - echo "$need failed, merging not allowed" - exit 1 - fi - done + if [ ${{ contains(needs.*.result, 'failure') }} ]; then + echo "At least one job failed, merging not allowed" + exit 1 + fi echo "Pull request merging now allowed." notify: From 14a13116ec5f1304df3dc0f4e25e81cf178fe3f3 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Fri, 3 May 2024 18:38:28 +0000 Subject: [PATCH 06/13] Update --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7f6a55ed09cc..d7fd55ddbbce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -367,11 +367,6 @@ jobs: if: always() steps: - run: | - echo "e2e status: ${{ needs.e2e.result }}" - echo "bb-native-tests status: ${{ needs.bb-native-tests.result }}" - echo "bb-bench status: ${{ needs.bb-bench.result }}" - echo "yarn-project-formatting status: ${{ needs.yarn-project-formatting.result }}" - echo "yarn-project-test status: ${{ needs.yarn-project-test.result }}" if [ ${{ contains(needs.*.result, 'failure') }} ]; then echo "At least one job failed, merging not allowed" exit 1 From f52601d3cfe31659a7d7e757d7559a168775d541 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Sat, 4 May 2024 10:31:54 +0000 Subject: [PATCH 07/13] Fix attempt --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7fd55ddbbce..3f4538c2c8ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -367,7 +367,8 @@ jobs: if: always() steps: - run: | - if [ ${{ contains(needs.*.result, 'failure') }} ]; then + if [ ${{ contains(needs.*.result, 'failure') }} ] + then echo "At least one job failed, merging not allowed" exit 1 fi From de50701d30d463187d8fd1cc2cce87456ee410fa Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 14:40:33 +0000 Subject: [PATCH 08/13] Attempt fix --- .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 10f682c687b4..84a074ae25db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -348,7 +348,7 @@ jobs: working-directory: ./barretenberg/cpp/ timeout-minutes: 15 run: earthly-ci --no-output +bench-ultra-honk --bench_mode=cache - + protocol-circuits-gates-report: needs: setup runs-on: ${{ inputs.username || github.actor }}-x86 @@ -402,7 +402,7 @@ jobs: if: always() steps: - run: | - if [ ${{ contains(needs.*.result, 'failure') }} ] + if [[ ${{ contains(needs.*.result, 'failure') }} ]] then echo "At least one job failed, merging not allowed" exit 1 From c9a781beccf42f3b04d2a7fa0f50257551a20042 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 14:57:28 +0000 Subject: [PATCH 09/13] WIP --- .github/workflows/ci.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index afc4e7c2127c..25694ed21dcc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -446,18 +446,7 @@ jobs: notify: needs: - [ - e2e, - bb-native-tests, - bb-bench, - yarn-project-formatting, - yarn-project-test, - prover-client-test, - bb-js-test, - barretenberg-acir-tests-bb-js, - barretenberg-acir-tests-bb, - barretenberg-acir-tests-sol, - ] + - merge-check runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/master' && failure() }} steps: From a9e6ddae12ea096eb2acaae888749410b3ab8151 Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 18:32:50 +0000 Subject: [PATCH 10/13] Fix attempt --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25694ed21dcc..2fc07ddf5e43 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,7 +437,8 @@ jobs: if: always() steps: - run: | - if [[ ${{ contains(needs.*.result, 'failure') }} ]] + failed=${{ contains(needs.*.result, 'failure') }} + if $failed then echo "At least one job failed, merging not allowed" exit 1 From 2d73baac57731efbc8eb17c67b3c51c7cde87e0c Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 19:52:00 +0000 Subject: [PATCH 11/13] Try logging --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fc07ddf5e43..010c8f85d50e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,13 +437,15 @@ jobs: if: always() steps: - run: | + converted=fromJSON(needs) + echo $converted failed=${{ contains(needs.*.result, 'failure') }} if $failed then - echo "At least one job failed, merging not allowed" + echo "At least one job failed, merging not allowed." exit 1 fi - echo "Pull request merging now allowed." + echo "Pull request merge allowed." notify: needs: From cf716ff1722b0933aec90cfb9111b15026c5e4ed Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 20:23:33 +0000 Subject: [PATCH 12/13] Another trial --- .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 010c8f85d50e..b0abdf8c7945 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,7 +437,7 @@ jobs: if: always() steps: - run: | - converted=fromJSON(needs) + converted=${{ toJSON(needs) }} echo $converted failed=${{ contains(needs.*.result, 'failure') }} if $failed From cafb7a300cdc2136cdc1afa93de8cdc1c8b320bd Mon Sep 17 00:00:00 2001 From: PhilWindle Date: Tue, 7 May 2024 21:09:11 +0000 Subject: [PATCH 13/13] Fix --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b0abdf8c7945..2ee38ec9342e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -437,15 +437,13 @@ jobs: if: always() steps: - run: | - converted=${{ toJSON(needs) }} - echo $converted failed=${{ contains(needs.*.result, 'failure') }} if $failed then echo "At least one job failed, merging not allowed." exit 1 fi - echo "Pull request merge allowed." + echo "All jobs succeeded, merge allowed." notify: needs: