Skip to content

Commit

Permalink
Merge branch 'master' into md/prover-node-no-attestations
Browse files Browse the repository at this point in the history
  • Loading branch information
Maddiaa0 committed Dec 13, 2024
2 parents 7f5c482 + b16945b commit 0ccda8d
Showing 1 changed file with 21 additions and 20 deletions.
41 changes: 21 additions & 20 deletions .github/workflows/ci-arm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,30 +86,31 @@ jobs:
sudo shutdown -P 60 # necessary to get around builtin hard timeout
earthly-ci ./yarn-project+export-e2e-test-images
# all the non-bench end-to-end integration tests for aztec
e2e:
needs: [build]
runs-on: master-arm
steps:
# permission kludge before checkout, see https://github.com/actions/checkout/issues/211#issuecomment-611986243
- run: sudo chown -R $USER:$USER /home/ubuntu/
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: ./.github/ci-setup-action
with:
concurrency_key: e2e-arm
# prepare images locally, tagged by commit hash
- name: "Build E2E Image"
timeout-minutes: 40
working-directory: ./yarn-project/end-to-end
run: |
./scripts/e2e_compose_test.sh uniswap_trade_on_l1_from_l2.test.ts
# TODO(https://github.com/AztecProtocol/aztec-packages/issues/10681)
# # all the non-bench end-to-end integration tests for aztec
# e2e:
# needs: [build]
# runs-on: master-arm
# steps:
# # permission kludge before checkout, see https://github.com/actions/checkout/issues/211#issuecomment-611986243
# - run: sudo chown -R $USER:$USER /home/ubuntu/
# - uses: actions/checkout@v4
# with: { ref: "${{ env.GIT_COMMIT }}" }
# - uses: ./.github/ci-setup-action
# with:
# concurrency_key: e2e-arm
# # prepare images locally, tagged by commit hash
# - name: "Build E2E Image"
# timeout-minutes: 40
# working-directory: ./yarn-project/end-to-end
# run: |
# ./scripts/e2e_compose_test.sh uniswap_trade_on_l1_from_l2.test.ts

rerun-check:
runs-on: ubuntu-20.04
permissions:
actions: write
needs: [setup, build-images, build, e2e]
needs: [setup, build-images, build] #, e2e]
if: ${{ !cancelled() }}
steps:
- name: Check for Rerun
Expand All @@ -126,7 +127,7 @@ jobs:
# NOTE: we only notify failures after a rerun has occurred
notify:
needs: [e2e]
needs: [build] #[e2e]
runs-on: ubuntu-latest
if: ${{ github.ref == 'refs/heads/master' && failure() && github.run_attempt >= 2 }}
steps:
Expand Down

0 comments on commit 0ccda8d

Please sign in to comment.