diff --git a/.github/workflows/devnet-deploys.yml b/.github/workflows/devnet-deploys.yml index 8a7c3c494d8..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 @@ -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: @@ -317,41 +275,8 @@ jobs: 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, - ] + needs: [set-network, build-aztec, build-aztec-nargo] env: DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} runs-on: ubuntu-latest @@ -367,14 +292,11 @@ jobs: 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 + aztecprotocol/aztec:${{ github.sha }}-x86_64 docker manifest create aztecprotocol/aztec:${{ github.sha }} \ - aztecprotocol/aztec:${{ github.sha }}-x86_64 \ - aztecprotocol/aztec:${{ github.sha }}-arm64 + aztecprotocol/aztec:${{ github.sha }}-x86_64 docker manifest push aztecprotocol/aztec:${{ env.DEPLOY_TAG }} docker manifest push aztecprotocol/aztec:${{ github.sha }} @@ -383,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 }} @@ -457,35 +376,8 @@ jobs: 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] + needs: [set-network, build-cli-wallet] env: DEPLOY_TAG: ${{ needs.set-network.outputs.deploy_tag }} runs-on: ${{ github.actor }}-x86 @@ -503,14 +395,11 @@ jobs: 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 + aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 docker manifest create aztecprotocol/cli-wallet:${{ github.sha }} \ - aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 \ - aztecprotocol/cli-wallet:${{ github.sha }}-arm64 + aztecprotocol/cli-wallet:${{ github.sha }}-x86_64 docker manifest push aztecprotocol/cli-wallet:${{ env.DEPLOY_TAG }} docker manifest push aztecprotocol/cli-wallet:${{ github.sha }}