Skip to content

Commit

Permalink
chore(ci): move yarn-project-test to new CI (#5850)
Browse files Browse the repository at this point in the history
to debug yarn-project-test failures locally:
`earthly -i ./yarn-project/+test` then once it fails you will be in a
local session, poke around and see if you can find the wrong artifact
version

---------

Co-authored-by: Santiago Palladino <santiago@aztecprotocol.com>
  • Loading branch information
ludamad and spalladino authored Apr 22, 2024
1 parent 07fc143 commit d8254ef
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 20 deletions.
14 changes: 0 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -407,18 +407,6 @@ jobs:
command: create_ecr_manifest yarn-project x86_64,arm64
aztec_manifest_key: yarn-project

yarn-project-test:
docker:
- image: aztecprotocol/alpine-build-image
resource_class: small
steps:
- *checkout
- *setup_env
- run:
name: "Build and test"
command: cond_spot_run_build yarn-project-test 64
aztec_manifest_key: yarn-project-test

prover-client-test:
docker:
- image: aztecprotocol/alpine-build-image
Expand Down Expand Up @@ -755,7 +743,6 @@ workflows:
- end-to-end: *defaults_yarn_project
- build-docs: *defaults_yarn_project_pre_join
- prover-client-test: *defaults_yarn_project
- yarn-project-test: *defaults_yarn_project
- yarn-project-x86_64: *defaults_yarn_project_pre_join
- yarn-project-arm64: *defaults_yarn_project_pre_join
- yarn-project-ecr-manifest:
Expand Down Expand Up @@ -804,7 +791,6 @@ workflows:
- boxes-vanilla
- boxes-react
- noir-packages-tests
- yarn-project-test
- prover-client-test
- e2e-join
<<: *defaults
Expand Down
36 changes: 31 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ jobs:
bb-native-tests:
needs: setup
runs-on: ${{ inputs.username || github.actor }}-x86
strategy:
fail-fast: false
steps:
- {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
# Only allow one memory-hunger prover test to use this runner
Expand All @@ -93,6 +91,34 @@ jobs:
# limit our parallelism to half our cores
run: earthly --no-output +test --hardware_concurrency=64

yarn-project-formatting:
needs: setup
runs-on: ${{ github.actor }}-x86
steps:
- {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
# Only allow one memory-hunger prover test to use this runner
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
concurrency_key: yarn-project-test-${{ github.actor }}-x86
- name: "Yarn Project Tests"
timeout-minutes: 25
run: earthly --no-output ./yarn-project/+format-check

yarn-project-test:
needs: setup
runs-on: ${{ github.actor }}-x86
steps:
- {uses: actions/checkout@v4, with: { ref: "${{ github.event.pull_request.head.sha }}"}}
# Only allow one memory-hunger prover test to use this runner
- uses: ./.github/ci-setup-action
with:
dockerhub_password: "${{ secrets.DOCKERHUB_PASSWORD }}"
concurrency_key: yarn-project-test-${{ github.actor }}-x86
- name: "Yarn Project Tests"
timeout-minutes: 25
run: earthly --no-output ./yarn-project/+test

# push benchmarking binaries to dockerhub registry
bb-bench-binaries:
needs: setup
Expand Down Expand Up @@ -142,13 +168,13 @@ jobs:
run: earthly --no-output +bench-ultra-honk --bench_mode=cache

merge-check:
runs-on: ${{ inputs.username || github.actor }}-x86
needs: [e2e, bb-native-tests, bb-bench]
runs-on: ubuntu-latest
needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
steps:
- run: echo Pull request merging now allowed.

notify:
needs: [e2e, bb-native-tests, bb-bench]
needs: [e2e, bb-native-tests, bb-bench, yarn-project-formatting, yarn-project-test]
runs-on: ubuntu-latest
if: ${{ github.ref == 'refs/heads/master' && failure() }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
group: start-builder-${{ inputs.runner_label }}
steps:
- name: Start EC2 runner
uses: AztecProtocol/ec2-action-builder@v0.15
uses: AztecProtocol/ec2-action-builder@v0.14e
with:
github_token: ${{ secrets.GH_SELF_HOSTED_RUNNER_TOKEN }}
aws_access_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
Expand Down
8 changes: 8 additions & 0 deletions yarn-project/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,11 @@ export-end-to-end:
SAVE IMAGE aztecprotocol/end-to-end:$EARTHLY_GIT_HASH
FROM +aztec
SAVE IMAGE aztecprotocol/aztec:$EARTHLY_GIT_HASH

format-check:
FROM +build
RUN yarn formatting

test:
FROM +build
RUN yarn test

0 comments on commit d8254ef

Please sign in to comment.