diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index c97f38655a..fcab158ed6 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -29,25 +29,17 @@ jobs: run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV - name: Checking out the Solidity repository - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive path: solidity - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: Checking out the compiler-tester candidate - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - repository: matter-labs/compiler-tester + repository: matter-labs/era-compiler-tester submodules: recursive path: compiler-tester - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - - - name: Preparing workspace - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - name: Building the Solidity compiler working-directory: solidity @@ -108,25 +100,18 @@ jobs: run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV - name: Checking out the Solidity repository - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive path: solidity - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: Checking out the compiler-tester reference - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - repository: matter-labs/compiler-tester + repository: matter-labs/era-compiler-tester + ref: main submodules: recursive path: compiler-tester - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - - - name: Preparing workspace - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - name: Benchmarking the Solidity compiler reference working-directory: compiler-tester @@ -170,18 +155,11 @@ jobs: run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV - name: Checking out the compiler-tester repository - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - repository: matter-labs/compiler-tester + repository: matter-labs/era-compiler-tester submodules: recursive path: compiler-tester - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - - - name: Preparing workspace - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - uses: actions/download-artifact@master with: @@ -216,7 +194,7 @@ jobs: if: github.event_name == 'pull_request' uses: machine-learning-apps/pr-comment@master env: - GITHUB_TOKEN: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: path: ./compiler-tester/result.txt diff --git a/.github/workflows/build_and_release_binary.yaml b/.github/workflows/build_and_release_binary.yaml index 4b2ccf7a2e..351e0fe206 100644 --- a/.github/workflows/build_and_release_binary.yaml +++ b/.github/workflows/build_and_release_binary.yaml @@ -38,18 +38,11 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Checkout source - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - - name: Prepare environment - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - - name: Building the Solidity compiler run: | mkdir -p ./build @@ -80,18 +73,11 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} steps: - name: Checkout source - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - - name: Prepare environment - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - - name: Building the Solidity compiler run: | mkdir -p ./build @@ -117,18 +103,11 @@ jobs: needs: [setup] steps: - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - - name: Prepare environment - shell: zsh {0} - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - # It is needed as we use some commands which a deprecated in newer versions of boost - name: Install BOOST shell: zsh {0} @@ -180,18 +159,11 @@ jobs: run: rm -rf ~/.gitconfig; rm -rf {*,.*} || true - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - - name: Prepare environment - shell: zsh {0} - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - # It is needed as we use some commands which a deprecated in newer versions of boost - name: Install BOOST shell: zsh {0} @@ -267,11 +239,10 @@ jobs: result-encoding: string - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 if: steps.compare_version.outputs.result != 'true' with: submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - name: Install LLVM and Clang @@ -283,8 +254,6 @@ jobs: - name: Prepare environment if: steps.compare_version.outputs.result != 'true' run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ git config --global user.email "runner@github.com" git fetch --all # try to apply win patch @@ -371,9 +340,8 @@ jobs: - build_windows_amd64 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} ref: ${{ steps.set.outputs.release_version }} - name: Download artifact macos_arm64 @@ -420,6 +388,5 @@ jobs: name: zkVM solc ${{ needs.setup.outputs.release_version }} body_path: ./tmp_changelog.txt tag_name: ${{ needs.setup.outputs.release_version }} - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} files: | releases/**/** diff --git a/.github/workflows/secrets_scanner.yaml b/.github/workflows/secrets_scanner.yaml index d36409b3ff..d0fea22668 100644 --- a/.github/workflows/secrets_scanner.yaml +++ b/.github/workflows/secrets_scanner.yaml @@ -5,11 +5,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: fetch-depth: 0 - name: TruffleHog OSS - uses: trufflesecurity/trufflehog@0c66d30c1f4075cee1aada2e1ab46dabb1b0071a + uses: trufflesecurity/trufflehog@11394ea318a12a5bf99c1b0cb7ba5e44b3c7a79c # v3.63.2 with: path: ./ base: ${{ github.event.repository.default_branch }} diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 99a1b4090a..d82c1aca59 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -22,25 +22,17 @@ jobs: run: echo "BRANCH_NAME=$(echo ${GITHUB_BASE_REF} | tr / -)" >> $GITHUB_ENV - name: Checking out the Solidity repository - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: submodules: recursive path: solidity - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - name: Checking out the compiler-tester repository - uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2 + uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: - repository: matter-labs/compiler-tester + repository: matter-labs/era-compiler-tester path: compiler-tester submodules: recursive - token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }} - - - name: Preparing workspace - run: | - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf ssh://git@github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf https://github.com/ - git config --global --add url."https://${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}:x-oauth-basic@github.com/".insteadOf git@github.com: - name: Building the Solidity compiler working-directory: solidity