Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): move yarn-project-test to new CI #5850

Merged
merged 16 commits into from
Apr 22, 2024
Merged
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 @@ -840,7 +828,6 @@ workflows:
- aztec-faucet: *defaults_yarn_project_pre_join
- 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 @@ -892,7 +879,6 @@ workflows:
- boxes-vanilla
- boxes-react
- noir-packages-tests
- yarn-project-test
- prover-client-test
- e2e-join
<<: *defaults
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ jobs:
bb-native-tests:
needs: setup
runs-on: ${{ 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 @@ -95,6 +93,21 @@ jobs:
# limit our parallelism to half our cores
run: earthly-ci --no-output +test --hardware_concurrency=64

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 }}"
# must be globally unique for build x runner
concurrency_key: yarn-project-test-${{ github.actor }}-x86
- name: "Yarn Project Tests"
timeout-minutes: 25
run: earthly-ci --no-output ./yarn-project/+test
ludamad marked this conversation as resolved.
Show resolved Hide resolved

# push benchmarking binaries to dockerhub registry
bb-bench-binaries:
needs: setup
Expand Down Expand Up @@ -146,12 +159,12 @@ jobs:

merge-check:
runs-on: ${{ github.actor }}-x86
needs: [e2e, bb-native-tests, bb-bench]
needs: [e2e, bb-native-tests, bb-bench, 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-test]
runs-on: ubuntu-latest
if: ${{ github.ref == 'refs/heads/master' && failure() }}
steps:
Expand Down
4 changes: 4 additions & 0 deletions yarn-project/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -98,3 +98,7 @@ export-end-to-end:
SAVE IMAGE aztecprotocol/end-to-end:$EARTHLY_GIT_HASH
FROM +aztec
SAVE IMAGE aztecprotocol/aztec:$EARTHLY_GIT_HASH

test:
FROM +build
RUN yarn formatting && yarn test
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it make sense to split these into two separate jobs, so we can see the output of tests even if linting fails?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I was copying verbatim

Loading