From c1c62320e166fed0347d0dabce1e0ae95c56ae04 Mon Sep 17 00:00:00 2001 From: spypsy Date: Tue, 27 Aug 2024 10:00:53 +0000 Subject: [PATCH 1/3] fix: remove devnet ARM builds for now --- .github/workflows/devnet-deploys.yml | 194 ++------------------------- 1 file changed, 8 insertions(+), 186 deletions(-) diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml index 8a7c3c494d8..fb1d8ba3e50 100644 --- a/.github/workflows/devnet-deploys.yml +++ b/.github/workflows/devnet-deploys.yml @@ -93,13 +93,6 @@ jobs: runner_type: builder-x86 secrets: inherit - setup-arm: - uses: ./.github/workflows/setup-runner.yml - with: - username: ${{ github.actor }} - runner_type: builder-arm - secrets: inherit - # Set network specific variables as outputs from this job to be referenced in later jobs set-network: needs: setup @@ -245,8 +238,8 @@ jobs: if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | env - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} --ARCH=x86_64 - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} - name: "Re-tag Aztec image" if: ${{ github.event.inputs.no_rebuild_images == 'true' }} @@ -256,41 +249,6 @@ jobs: docker tag aztecprotocol/aztec:${{ env.DEPLOY_TAG }}-x86_64 aztecprotocol/aztec:${{ github.sha }}-x86_64 docker push aztecprotocol/aztec:${{ github.sha }}-x86_64 - build-aztec-arm: - needs: [set-network, setup-arm] - env: - BRANCH_NAME: ${{ needs.set-network.outputs.branch_name }} - DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - TF_VAR_DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - TF_VAR_API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - API_KEY_NAME: ${{ needs.set-network.outputs.network_api_key }} - runs-on: ${{ github.actor }}-arm - steps: - - uses: actions/checkout@v4 - with: - ref: "${{ env.GIT_COMMIT }}" - fetch-depth: 0 - - uses: ./.github/ci-setup-action - with: - concurrency_key: build-aztec-${{ github.actor }} - dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - name: "Build & Push aztec images" - timeout-minutes: 60 - if: ${{ github.event.inputs.no_rebuild_images == 'false' }} - run: | - env - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} --ARCH=arm64 - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=arm64 - - - name: "Re-tag Aztec image" - if: ${{ github.event.inputs.no_rebuild_images == 'true' }} - run: | - env - docker pull aztecprotocol/aztec:${{ env.DEPLOY_TAG }}-arm64 - docker tag aztecprotocol/aztec:${{ env.DEPLOY_TAG }}-arm64 aztecprotocol/aztec:${{ github.sha }}-arm64 - docker push aztecprotocol/aztec:${{ github.sha }}-arm64 - build-aztec-nargo: needs: [set-network, build-aztec] env: @@ -314,86 +272,8 @@ jobs: - name: Build & push aztec nargo image if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ github.sha }} --ARCH=x86_64 - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 - - build-aztec-nargo-arm: - needs: [set-network, setup-arm, build-aztec-arm] - env: - BRANCH_NAME: ${{ needs.set-network.outputs.branch_name }} - DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - TF_VAR_DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - TF_VAR_API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - API_KEY_NAME: ${{ needs.set-network.outputs.network_api_key }} - runs-on: ${{ github.actor }}-arm - steps: - - uses: actions/checkout@v4 - with: - ref: "${{ env.GIT_COMMIT }}" - fetch-depth: 0 - - uses: ./.github/ci-setup-action - with: - concurrency_key: build-aztec-nargo-${{ github.actor }} - dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - - name: Build & push aztec nargo image - if: ${{ github.event.inputs.no_rebuild_images == 'false' }} - run: | - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ github.sha }} --ARCH=arm64 - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=arm64 - - publish-aztec-manifests: - needs: - [ - set-network, - build-aztec, - build-aztec-arm, - build-aztec-nargo, - build-aztec-nargo-arm, - ] - env: - DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - ref: "${{ env.GIT_COMMIT }}" - - uses: ./.github/ci-setup-action - with: - dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - - name: "Publish aztec manifests" - run: | - env - docker pull aztecprotocol/aztec:${{ github.sha }}-x86_64 - docker pull aztecprotocol/aztec:${{ github.sha }}-arm64 - - docker manifest create aztecprotocol/aztec:${{ env.DEPLOY_TAG }} \ - aztecprotocol/aztec:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec:${{ github.sha }}-arm64 - docker manifest create aztecprotocol/aztec:${{ github.sha }} \ - aztecprotocol/aztec:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec:${{ github.sha }}-arm64 - - docker manifest push aztecprotocol/aztec:${{ env.DEPLOY_TAG }} - docker manifest push aztecprotocol/aztec:${{ github.sha }} - - - name: "Publish aztec-nargo manifests" - if: ${{ github.event.inputs.no_rebuild_images == 'false' }} - run: | - docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 - docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 - - docker manifest create aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} \ - aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 - docker manifest create aztecprotocol/aztec-nargo:${{ github.sha }} \ - aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 - - docker manifest push aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} - docker manifest push aztecprotocol/aztec-nargo:${{ github.sha }} + earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ github.sha }} + earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.DEPLOY_TAG }} build-faucet: needs: [set-network, build-aztec] @@ -454,66 +334,8 @@ jobs: if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | env - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ github.sha }} --ARCH=x86_64 - - build-cli-wallet-arm: - needs: [set-network, build-aztec-arm] - env: - BRANCH_NAME: ${{ needs.set-network.outputs.branch_name }} - DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - TF_VAR_DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - TF_VAR_API_KEY: ${{ secrets[needs.set-network.outputs.network_api_key] }} - API_KEY_NAME: ${{ needs.set-network.outputs.network_api_key }} - runs-on: ${{ github.actor }}-arm - steps: - - uses: actions/checkout@v4 - with: - ref: "${{ env.GIT_COMMIT }}" - fetch-depth: 0 - - uses: ./.github/ci-setup-action - with: - concurrency_key: build-cli-wallet-${{ github.actor }} - dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - name: "Build & Push aztec images" - timeout-minutes: 40 - if: ${{ github.event.inputs.no_rebuild_images == 'false' }} - run: | - env - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=arm64 - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ github.sha }} --ARCH=arm64 - - publish-cli-wallet-manifest: - needs: [set-network, build-cli-wallet, build-cli-wallet-arm] - env: - DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} - runs-on: ${{ github.actor }}-x86 - steps: - - uses: actions/checkout@v4 - with: - ref: "${{ env.GIT_COMMIT }}" - fetch-depth: 0 - - uses: ./.github/ci-setup-action - with: - dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" - - - name: "Publish aztec CLI wallet manifests" - if: ${{ github.event.inputs.no_rebuild_images == 'false' }} - run: | - env - docker pull aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 - docker pull aztecprotocol/cli-wallet:${{ github.sha }}-arm64 - - docker manifest create aztecprotocol/cli-wallet:${{ env.DEPLOY_TAG }} \ - aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 \ - aztecprotocol/cli-wallet:${{ github.sha }}-arm64 - docker manifest create aztecprotocol/cli-wallet:${{ github.sha }} \ - aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 \ - aztecprotocol/cli-wallet:${{ github.sha }}-arm64 - - docker manifest push aztecprotocol/cli-wallet:${{ env.DEPLOY_TAG }} - docker manifest push aztecprotocol/cli-wallet:${{ github.sha }} + earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.DEPLOY_TAG }} + earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ github.sha }} build-end: runs-on: ubuntu-latest @@ -522,8 +344,8 @@ jobs: set-network, build-faucet, build-mainnet-fork, - publish-aztec-manifests, - publish-cli-wallet-manifest, + build-aztec, + build-cli-wallet, ] env: BRANCH_NAME: ${{ needs.set-network.outputs.branch_name }} From faa7c046db89b653c9539d538af110f6251d919b Mon Sep 17 00:00:00 2001 From: spypsy Date: Tue, 27 Aug 2024 10:15:58 +0000 Subject: [PATCH 2/3] use manifest for just x86_64 --- .github/workflows/devnet-deploys.yml | 93 +++++++++++++++++++++++++--- 1 file changed, 85 insertions(+), 8 deletions(-) diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml index fb1d8ba3e50..9bff339158e 100644 --- a/.github/workflows/devnet-deploys.yml +++ b/.github/workflows/devnet-deploys.yml @@ -93,6 +93,13 @@ jobs: runner_type: builder-x86 secrets: inherit + setup-arm: + uses: ./.github/workflows/setup-runner.yml + with: + username: ${{ github.actor }} + runner_type: builder-arm + secrets: inherit + # Set network specific variables as outputs from this job to be referenced in later jobs set-network: needs: setup @@ -238,8 +245,8 @@ jobs: if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | env - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} - earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ github.sha }} --ARCH=x86_64 + earthly-ci --no-output --push ./yarn-project+export-aztec-arch --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 - name: "Re-tag Aztec image" if: ${{ github.event.inputs.no_rebuild_images == 'true' }} @@ -272,8 +279,50 @@ jobs: - name: Build & push aztec nargo image if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ github.sha }} - earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.DEPLOY_TAG }} + earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ github.sha }} --ARCH=x86_64 + earthly-ci --no-output --push ./aztec-nargo+export-aztec-nargo --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 + + publish-aztec-manifests: + needs: [set-network, build-aztec, build-aztec-nargo] + env: + DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + ref: "${{ env.GIT_COMMIT }}" + - uses: ./.github/ci-setup-action + with: + dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" + + - name: "Publish aztec manifests" + run: | + env + docker pull aztecprotocol/aztec:${{ github.sha }}-x86_64 + + docker manifest create aztecprotocol/aztec:${{ env.DEPLOY_TAG }} \ + aztecprotocol/aztec:${{ github.sha }}-x86_64 + docker manifest create aztecprotocol/aztec:${{ github.sha }} \ + aztecprotocol/aztec:${{ github.sha }}-x86_64 + + docker manifest push aztecprotocol/aztec:${{ env.DEPLOY_TAG }} + docker manifest push aztecprotocol/aztec:${{ github.sha }} + + - name: "Publish aztec-nargo manifests" + if: ${{ github.event.inputs.no_rebuild_images == 'false' }} + run: | + docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 + docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 + + docker manifest create aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} \ + aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ + aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 + docker manifest create aztecprotocol/aztec-nargo:${{ github.sha }} \ + aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ + aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 + + docker manifest push aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} + docker manifest push aztecprotocol/aztec-nargo:${{ github.sha }} build-faucet: needs: [set-network, build-aztec] @@ -334,8 +383,36 @@ jobs: if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | env - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.DEPLOY_TAG }} - earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ github.sha }} + earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ env.DEPLOY_TAG }} --ARCH=x86_64 + earthly-ci --no-output --push ./yarn-project+export-cli-wallet --DIST_TAG=${{ github.sha }} --ARCH=x86_64 + + publish-cli-wallet-manifest: + needs: [set-network, build-cli-wallet] + env: + DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} + runs-on: ${{ github.actor }}-x86 + steps: + - uses: actions/checkout@v4 + with: + ref: "${{ env.GIT_COMMIT }}" + fetch-depth: 0 + - uses: ./.github/ci-setup-action + with: + dockerhub_password: "${{ env.DOCKERHUB_PASSWORD }}" + + - name: "Publish aztec CLI wallet manifests" + if: ${{ github.event.inputs.no_rebuild_images == 'false' }} + run: | + env + docker pull aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 + + docker manifest create aztecprotocol/cli-wallet:${{ env.DEPLOY_TAG }} \ + aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 + docker manifest create aztecprotocol/cli-wallet:${{ github.sha }} \ + aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 + + docker manifest push aztecprotocol/cli-wallet:${{ env.DEPLOY_TAG }} + docker manifest push aztecprotocol/cli-wallet:${{ github.sha }} build-end: runs-on: ubuntu-latest @@ -344,8 +421,8 @@ jobs: set-network, build-faucet, build-mainnet-fork, - build-aztec, - build-cli-wallet, + publish-aztec-manifests, + publish-cli-wallet-manifest, ] env: BRANCH_NAME: ${{ needs.set-network.outputs.branch_name }} From d30774fe9b9a56b097b81da0f8c0cc8068716a88 Mon Sep 17 00:00:00 2001 From: spypsy Date: Tue, 27 Aug 2024 10:16:42 +0000 Subject: [PATCH 3/3] fix remaining arm buidls --- .github/workflows/devnet-deploys.yml | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml index 9bff339158e..8086fd9eb7f 100644 --- a/.github/workflows/devnet-deploys.yml +++ b/.github/workflows/devnet-deploys.yml @@ -93,13 +93,6 @@ jobs: runner_type: builder-x86 secrets: inherit - setup-arm: - uses: ./.github/workflows/setup-runner.yml - with: - username: ${{ github.actor }} - runner_type: builder-arm - secrets: inherit - # Set network specific variables as outputs from this job to be referenced in later jobs set-network: needs: setup @@ -312,14 +305,11 @@ jobs: if: ${{ github.event.inputs.no_rebuild_images == 'false' }} run: | docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 - docker pull aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 docker manifest create aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} \ - aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 + aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 docker manifest create aztecprotocol/aztec-nargo:${{ github.sha }} \ - aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec-nargo:${{ github.sha }}-arm64 + aztecprotocol/aztec-nargo:${{ github.sha }}-x86_64 docker manifest push aztecprotocol/aztec-nargo:${{ env.DEPLOY_TAG }} docker manifest push aztecprotocol/aztec-nargo:${{ github.sha }}