Skip to content

Commit

Permalink
Merge branch 'tf/remove-codegen-verifier' into tf/remove-prove-verify
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench authored May 16, 2024
2 parents a77c447 + 0016c8d commit a860e13
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 16 deletions.
41 changes: 26 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,9 +208,21 @@ jobs:
- uses: ./.github/ci-setup-action
with:
concurrency_key: noir-x86
- name: "Test Noir JS packages"
- name: "Test Nargo"
run: earthly-ci --no-output ./noir+test

noir-examples:
needs: setup
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: ./.github/ci-setup-action
with:
concurrency_key: noir-examples-x86
- name: "Test Noir examples"
run: earthly-ci --no-output ./noir+examples

noir-packages-test:
needs: setup
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
Expand Down Expand Up @@ -420,20 +432,19 @@ 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,
noir-test,
noir-packages-test,
]
- setup
- 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
- noir-test
- noir-packages-test
if: always()
steps:
- run: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ template <typename PCS> class ZeroMorphProver_ {

// TODO(#742): Set this N_max to be the number of G1 elements in the mocked zeromorph SRS once it's in place.
// (Then, eventually, set it based on the real SRS). For now we set it to be large but more or less arbitrary.
static const size_t N_max = 1 << 22;
static const size_t N_max = 1 << 23;

public:
/**
Expand Down

0 comments on commit a860e13

Please sign in to comment.