diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml index 178b96988e90..7f41d2cfad87 100644 --- a/.github/workflows/build-core-template.yml +++ b/.github/workflows/build-core-template.yml @@ -24,70 +24,70 @@ on: required: false jobs: - build-images: - name: Build and Push amd64 Docker Images - runs-on: matterlabs-ci-runner - strategy: - matrix: - component: - - server-v2 - - contract-verifier - - cross-external-nodes-checker - - external-node - env: - image_tag: ${{ inputs.image_tag }} - IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }} - steps: - - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c - with: - submodules: "recursive" - - name: setup-env - run: | - echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV - echo CI=1 >> $GITHUB_ENV - echo $(pwd)/bin >> $GITHUB_PATH - echo CI=1 >> .env - echo IN_DOCKER=1 >> .env + # build-images: + # name: Build and Push amd64 Docker Images + # runs-on: matterlabs-ci-runner + # strategy: + # matrix: + # component: + # - server-v2 + # - contract-verifier + # - cross-external-nodes-checker + # - external-node + # env: + # image_tag: ${{ inputs.image_tag }} + # IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }} + # steps: + # - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c + # with: + # submodules: "recursive" + # - name: setup-env + # run: | + # echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV + # echo CI=1 >> $GITHUB_ENV + # echo $(pwd)/bin >> $GITHUB_PATH + # echo CI=1 >> .env + # echo IN_DOCKER=1 >> .env - - name: start-services - run: | - echo "IMAGE_TAG_SUFFIX=${{ env.IMAGE_TAG_SUFFIX }}" >> .env - docker-compose -f docker-compose-runner.yml up --no-deps -d zk - ci_run sccache --start-server + # - name: start-services + # run: | + # echo "IMAGE_TAG_SUFFIX=${{ env.IMAGE_TAG_SUFFIX }}" >> .env + # docker-compose -f docker-compose-runner.yml up --no-deps -d zk + # ci_run sccache --start-server - - name: init - run: | - ci_run git config --global --add safe.directory /usr/src/zksync - ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen - ci_run git config --global --add safe.directory /usr/src/zksync/etc/system-contracts - ci_run git config --global --add safe.directory /usr/src/zksync/contracts - ci_run zk - ci_run zk clean --all - ci_run zk run yarn - ci_run cp etc/tokens/{test,localhost}.json - ci_run zk compiler all - ci_run zk contract build - ci_run zk f yarn run l2-contracts build - ci_run curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key + # - name: init + # run: | + # ci_run git config --global --add safe.directory /usr/src/zksync + # ci_run git config --global --add safe.directory /usr/src/zksync/sdk/binaryen + # ci_run git config --global --add safe.directory /usr/src/zksync/etc/system-contracts + # ci_run git config --global --add safe.directory /usr/src/zksync/contracts + # ci_run zk + # ci_run zk clean --all + # ci_run zk run yarn + # ci_run cp etc/tokens/{test,localhost}.json + # ci_run zk compiler all + # ci_run zk contract build + # ci_run zk f yarn run l2-contracts build + # ci_run curl -LO https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2\^26.key - - name: login to Docker registries - if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) - run: | - ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }} - ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q + # - name: login to Docker registries + # if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/')) + # run: | + # ci_run docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }} + # ci_run gcloud auth configure-docker us-docker.pkg.dev,asia-docker.pkg.dev -q - - name: update-images - env: - DOCKER_ACTION: ${{ inputs.action }} - COMPONENT: ${{ matrix.component }} - run: | - ci_run zk docker $DOCKER_ACTION $COMPONENT --platforms "linux/amd64" -- --public + # - name: update-images + # env: + # DOCKER_ACTION: ${{ inputs.action }} + # COMPONENT: ${{ matrix.component }} + # run: | + # ci_run zk docker $DOCKER_ACTION $COMPONENT --platforms "linux/amd64" -- --public - - name: Show sccache stats - if: always() - run: | - ci_run sccache --show-stats - ci_run cat /tmp/sccache_log.txt + # - name: Show sccache stats + # if: always() + # run: | + # ci_run sccache --show-stats + # ci_run cat /tmp/sccache_log.txt build-images-arm: name: Build and Push arm64 Docker Images @@ -103,6 +103,8 @@ jobs: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c with: submodules: "recursive" + ref: ${{ github.ref }} + - name: setup-env run: | echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml index d499a7afaada..f0616c38213c 100644 --- a/.github/workflows/build-docker-from-tag.yml +++ b/.github/workflows/build-docker-from-tag.yml @@ -13,9 +13,8 @@ on: type: string required: true push: - tags: - - core-v** - - prover-v** + branches: + - "ci-core-multiarch" concurrency: docker-build @@ -29,6 +28,7 @@ jobs: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 with: submodules: "recursive" + ref: ${{ github.ref }} - name: Generate output with git tag id: set @@ -54,34 +54,34 @@ jobs: image_tag: ${{ needs.setup.outputs.image_tag }} image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} - build-push-prover-images: - name: Build and push image - needs: [setup] - uses: ./.github/workflows/build-prover-template.yml - if: contains(github.ref_name, 'prover') - with: - image_tag: ${{ needs.setup.outputs.image_tag }} - image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} - ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} - secrets: - DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} - DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + # build-push-prover-images: + # name: Build and push image + # needs: [setup] + # uses: ./.github/workflows/build-prover-template.yml + # if: contains(github.ref_name, 'prover') + # with: + # image_tag: ${{ needs.setup.outputs.image_tag }} + # image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} + # ERA_BELLMAN_CUDA_RELEASE: ${{ vars.ERA_BELLMAN_CUDA_RELEASE }} + # secrets: + # DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }} + # DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - build-gar-prover: - name: Build GAR prover - needs: [setup, build-push-prover-images] - uses: ./.github/workflows/build-gar-reusable.yml - if: contains(github.ref_name, 'prover') - with: - setup_keys_id: 4989f12 - image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} - push_asia: true + # build-gar-prover: + # name: Build GAR prover + # needs: [setup, build-push-prover-images] + # uses: ./.github/workflows/build-gar-reusable.yml + # if: contains(github.ref_name, 'prover') + # with: + # setup_keys_id: 4989f12 + # image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} + # push_asia: true - build-gar-prover-fri-gpu: - name: Build GAR prover FRI GPU - needs: [setup, build-push-prover-images] - uses: ./.github/workflows/build-prover-fri-gpu-gar.yml - if: contains(github.ref_name, 'prover') - with: - setup_keys_id: 2d33a27-gpu - image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }} + # build-gar-prover-fri-gpu: + # name: Build GAR prover FRI GPU + # needs: [setup, build-push-prover-images] + # uses: ./.github/workflows/build-prover-fri-gpu-gar.yml + # if: contains(github.ref_name, 'prover') + # with: + # setup_keys_id: 2d33a27-gpu + # image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}