Merge branch 'sync-layer-stable' into sb-sync-main-sls

matter-labs · Dec 19, 2024 · 9f65dbd · 9f65dbd
2 parents fa83edd + 3f4e4a7
commit 9f65dbd
Show file tree

Hide file tree

Showing 29 changed files with 2 additions and 143 deletions.
diff --git a/.github/workflows/build-base.yml b/.github/workflows/build-base.yml
@@ -29,7 +29,6 @@ jobs:
     steps:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Login to google container registry

diff --git a/.github/workflows/build-contract-verifier-template.yml b/.github/workflows/build-contract-verifier-template.yml
@@ -8,9 +8,6 @@ on:
       DOCKERHUB_TOKEN:
         description: "DOCKERHUB_TOKEN"
         required: true
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       image_tag_suffix:
         description: "Optional suffix to override tag name generation"
@@ -43,7 +40,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: setup-env

diff --git a/.github/workflows/build-core-template.yml b/.github/workflows/build-core-template.yml
@@ -8,9 +8,6 @@ on:
       DOCKERHUB_TOKEN:
         description: "DOCKERHUB_TOKEN"
         required: true
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       image_tag_suffix:
         description: "Optional suffix to override tag name generation"
@@ -52,7 +49,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: setup-env
@@ -185,8 +181,6 @@ jobs:
       IMAGE_TAG_SUFFIX: ${{ inputs.image_tag_suffix }}${{ (inputs.en_alpha_release && matrix.component.name == 'external-node') && '-alpha' || '' }}
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-        with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - name: login to Docker registries
         run: |

diff --git a/.github/workflows/build-docker-from-tag.yml b/.github/workflows/build-docker-from-tag.yml
@@ -1,10 +1,6 @@
 name: Build Image from tag
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       tag_name:
         description: "Tag of an image to built"
@@ -16,10 +12,6 @@ on:
         description: "Tag of an image to built"
         type: string
         required: true
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
   push:
     tags:
       - core-v**
@@ -37,8 +29,6 @@ jobs:
       prover_fri_gpu_key_id: ${{ steps.extract-prover-fri-setup-key-ids.outputs.gpu_short_commit_sha }}
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
-        with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
       - name: Generate output with git tag
         id: set
         run: |
@@ -64,7 +54,6 @@ jobs:
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       en_alpha_release: true
@@ -79,7 +68,6 @@ jobs:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       ATTIC_TOKEN: ${{ secrets.ATTIC_TOKEN }}
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
 
@@ -91,7 +79,6 @@ jobs:
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
     with:
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       action: "push"
@@ -108,7 +95,6 @@ jobs:
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
   build-push-witness-generator-image-avx512:
     name: Build and push image
@@ -123,7 +109,6 @@ jobs:
     secrets:
       DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
   build-gar-prover-fri-gpu-and-circuit-prover-gpu-gar:
     name: Build GAR prover FRI GPU
@@ -134,5 +119,3 @@ jobs:
       setup_keys_id: ${{ needs.setup.outputs.prover_fri_gpu_key_id }}
       image_tag_suffix: ${{ needs.setup.outputs.image_tag_suffix }}
       protocol_version: ${{ needs.build-push-prover-images.outputs.protocol_version }}
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
diff --git a/.github/workflows/build-local-node-docker.yml b/.github/workflows/build-local-node-docker.yml
@@ -20,7 +20,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: setup-env

diff --git a/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml b/.github/workflows/build-prover-fri-gpu-gar-and-circuit-prover-gpu-gar.yml
@@ -3,9 +3,6 @@ name: Build Prover FRI GPU & Circuit Prover GPU with builtin setup data
 on:
   workflow_call:
     secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       image_tag_suffix:
         description: "Commit sha or git tag for Docker tag"
@@ -27,7 +24,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Download Setup data

diff --git a/.github/workflows/build-prover-template.yml b/.github/workflows/build-prover-template.yml
@@ -8,9 +8,6 @@ on:
       DOCKERHUB_TOKEN:
         description: "DOCKERHUB_TOKEN"
         required: true
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       ERA_BELLMAN_CUDA_RELEASE:
         description: "ERA_BELLMAN_CUDA_RELEASE"
@@ -65,7 +62,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: setup-env

diff --git a/.github/workflows/build-runtime-base.yml b/.github/workflows/build-runtime-base.yml
@@ -26,7 +26,6 @@ jobs:
     steps:
       - uses: actions/checkout@6d193bf28034eafb982f37bd894289fe649468fc # v4.1.7
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Login to google container registry

diff --git a/.github/workflows/build-tee-prover-template.yml b/.github/workflows/build-tee-prover-template.yml
@@ -11,9 +11,6 @@ on:
       ATTIC_TOKEN:
         description: "ATTIC_TOKEN"
         required: false
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       image_tag_suffix:
         description: "Optional suffix to override tag name generation"
@@ -35,12 +32,9 @@ jobs:
         if: ${{ github.event_name == 'workflow_dispatch' }}
         with:
           ref: ${{ github.event.inputs.target_branch }}
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         if: ${{ github.event_name != 'workflow_dispatch' }}
-        with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
 
       - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
         with:

diff --git a/.github/workflows/build-witness-generator-template.yml b/.github/workflows/build-witness-generator-template.yml
@@ -8,9 +8,6 @@ on:
       DOCKERHUB_TOKEN:
         description: "DOCKERHUB_TOKEN"
         required: true
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       ERA_BELLMAN_CUDA_RELEASE:
         description: "ERA_BELLMAN_CUDA_RELEASE"
@@ -59,7 +56,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: setup-env

diff --git a/.github/workflows/ci-common-reusable.yml b/.github/workflows/ci-common-reusable.yml
@@ -1,10 +1,6 @@
 name: Workflow template for CI jobs to be ran on both Prover and Core Components
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
 
 jobs:
   build:
@@ -15,7 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Setup environment

diff --git a/.github/workflows/ci-core-lint-reusable.yml b/.github/workflows/ci-core-lint-reusable.yml
@@ -1,18 +1,13 @@
 name: Workflow template for Core Linting CI jobs
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
 
 jobs:
   code_lint:
     runs-on: matterlabs-ci-runner-highmem-long
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Setup environment

diff --git a/.github/workflows/ci-core-reusable.yml b/.github/workflows/ci-core-reusable.yml
@@ -1,10 +1,6 @@
 name: Workflow template for CI jobs for Core Components
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
     inputs:
       compilers:
         description: "JSON of required compilers and their versions"
@@ -20,15 +16,12 @@ jobs:
   lint:
     name: lint
     uses: ./.github/workflows/ci-core-lint-reusable.yml
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
   unit-tests:
     runs-on: [ matterlabs-ci-runner-highmem-long ]
 
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
           fetch-depth: 0
 
@@ -101,7 +94,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
           fetch-depth: 0
 
@@ -185,7 +177,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
           fetch-depth: 0
 

diff --git a/.github/workflows/ci-docs-reusable.yml b/.github/workflows/ci-docs-reusable.yml
@@ -1,10 +1,6 @@
 name: Workflow template for CI jobs against docs
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
 
 jobs:
   lint:
@@ -14,7 +10,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Setup environment

diff --git a/.github/workflows/ci-prover-e2e.yml b/.github/workflows/ci-prover-e2e.yml
@@ -1,10 +1,6 @@
 name: Workflow for testing prover component end-to-end
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
 
 jobs:
   e2e-test:
@@ -15,7 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
           fetch-depth: 0
 

diff --git a/.github/workflows/ci-prover-reusable.yml b/.github/workflows/ci-prover-reusable.yml
@@ -1,10 +1,6 @@
 name: Workflow template for CI jobs for Prover Components
 on:
   workflow_call:
-    secrets:
-      ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE:
-        description: "Token which will be provided to checkout action to be able to clone private submodules"
-        required: true
 
 jobs:
   lint:
@@ -15,7 +11,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Setup environment
@@ -57,7 +52,6 @@ jobs:
     steps:
       - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
         with:
-          token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
           submodules: "recursive"
 
       - name: Setup environment