Skip to content

Commit

Permalink
chore: Merge back to master (#7785)
Browse files Browse the repository at this point in the history
This PR is to bring the deployment changes back to master.

---------

Co-authored-by: Alex Gherghisan <[email protected]>
Co-authored-by: Aztec Bot <[email protected]>
Co-authored-by: sirasistant <[email protected]>
Co-authored-by: Maxim Vezenov <[email protected]>
Co-authored-by: Facundo <[email protected]>
Co-authored-by: AztecBot <[email protected]>
Co-authored-by: Alex Gherghisan <[email protected]>
Co-authored-by: Santiago Palladino <[email protected]>
Co-authored-by: spypsy <[email protected]>
  • Loading branch information
10 people authored Aug 6, 2024
1 parent 641229e commit 2ad6e6f
Show file tree
Hide file tree
Showing 98 changed files with 5,074 additions and 1,742 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
# (Note ARM uses just 2 tests as a smoketest)
- name: Create list of non-bench end-to-end jobs
id: e2e_list
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep -v '+base' | grep -v '+bench' | grep -v 'devnet' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
- name: Create list of bench end-to-end jobs
id: bench_list
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep '+bench' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT
Expand Down
481 changes: 423 additions & 58 deletions .github/workflows/devnet-deploys.yml

Large diffs are not rendered by default.

85 changes: 85 additions & 0 deletions .github/workflows/devnet-smoke.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: Run devnet smoke tests
on:
workflow_dispatch:
workflow_run:
workflows:
- Deploy to network
types:
# triggered even if the workflow fails
- completed

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
GIT_COMMIT: devnet
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AZTEC_NODE_URL: https://api.aztec.network/devnet/aztec-node-1/{{ secrets.DEVNET_API_KEY }}
FAUCET_URL: https://api.aztec.network/devnet/aztec-faucet/{{ secrets.DEVNET_API_KEY }}
ETHEREUM_HOST: https://devnet-mainnet-fork.aztec.network:8545/${{ secrets.DEVNET_API_KEY }}

jobs:
setup:
uses: ./.github/workflows/setup-runner.yml
with:
username: ${{ github.event.pull_request.user.login || github.actor }}
runner_type: builder-x86
secrets: inherit
if: ${{ github.event.workflow_run.conclusion == 'success' }}

build:
needs: setup
runs-on: ${{ github.event.pull_request.user.login || github.actor }}-x86
outputs:
e2e_list: ${{ steps.e2e_list.outputs.list }}
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
with:
ref: "${{ env.GIT_COMMIT }}"

- uses: ./.github/ci-setup-action
with:
concurrency_key: build-test-artifacts-${{ github.actor }}

- name: "Build E2E Image"
timeout-minutes: 40
run: |
earthly-ci ./yarn-project+export-e2e-test-images
- name: Create list of devnet end-to-end jobs
id: e2e_list
run: echo "list=$(earthly ls ./yarn-project/end-to-end | grep 'devnet' | sed 's/+//' | jq -R . | jq -cs .)" >> $GITHUB_OUTPUT

e2e:
needs: build
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
test: ${{ fromJson( needs.build.outputs.e2e_list )}}
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: actions/checkout@v4
with: { ref: "${{ env.GIT_COMMIT }}" }
- uses: ./.github/ci-setup-action
- name: Setup and Test
timeout-minutes: 40
uses: ./.github/ensure-tester-with-images
with:
# big machine since we're doing proving
runner_type: "64core-tester-x86"
builder_type: builder-x86
# these are copied to the tester and expected by the earthly command below
# if they fail to copy, it will try to build them on the tester and fail
builder_images_to_copy: aztecprotocol/end-to-end:${{ env.GIT_COMMIT }}
# command to produce the images in case they don't exist
builder_command: scripts/earthly-ci ./yarn-project+export-e2e-test-images
run: |
set -eux
cd ./yarn-project/end-to-end/
export FORCE_COLOR=1
../../scripts/earthly-ci -P --no-output +${{ matrix.test }}
6 changes: 6 additions & 0 deletions aztec-nargo/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ run:
ENV PATH "/usr/bin:${PATH}"
ENTRYPOINT ["/usr/bin/tini", "--", "/usr/bin/compile_then_transpile.sh"]
SAVE IMAGE aztecprotocol/aztec-nargo

export-aztec-nargo:
FROM +run
ARG DIST_TAG="latest"
ARG ARCH
SAVE IMAGE --push aztecprotocol/aztec-nargo:${DIST_TAG}${ARCH:+-$ARCH}
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@
"protobuf",
"protogalaxy",
"proverless",
"PROVERNET",
"proxied",
"proxified",
"proxify",
Expand Down
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ configs:
otlp:
protocols:
http:
endpoint: 0.0.0.0:4318
processors:
batch:
Expand Down
Loading

0 comments on commit 2ad6e6f

Please sign in to comment.