-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:matter-labs/zksync-era into matias/…
…refactor-chain-commands
- Loading branch information
Showing
412 changed files
with
4,921 additions
and
5,096 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| { | ||
| "core": "25.1.0", | ||
| "prover": "17.0.0", | ||
| "core": "25.2.0", | ||
| "prover": "17.1.0", | ||
| "zkstack_cli": "0.1.2" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| name: Deploy core docs | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - "main" | ||
| tags: | ||
| - "core-v*.*.*" | ||
| paths: | ||
| - 'docs/**' | ||
| - '.github/workflows/deploy-core-docs.yml' | ||
| pull_request: | ||
| paths: | ||
| - 'docs/**' | ||
| - '.github/workflows/deploy-core-docs.yml' | ||
| workflow_dispatch: | ||
| inputs: | ||
| ref: | ||
| description: "Branch, tag or commit to deploy the core docs. If empty, use the ref that triggered the workflow." | ||
| required: false | ||
| default: "" | ||
| version: | ||
| type: string | ||
| description: "Version of the documentation to deploy" | ||
| required: false | ||
| default: "latest" | ||
|
|
||
| # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. | ||
| # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. | ||
| concurrency: | ||
| group: "pages" | ||
| cancel-in-progress: false | ||
|
|
||
| jobs: | ||
|
|
||
| deploy-core-docs: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| env: | ||
| DOCS_DIR: 'docs' | ||
| PROJECT: 'core' | ||
| ENABLE_TESTS: false | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| with: | ||
| ref: ${{ inputs.ref || '' }} | ||
|
|
||
| - name: Extract version from tag | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
| id: extract-version | ||
| shell: 'bash -ex {0}' | ||
| run: | | ||
| TAG="${{ github.ref_name }}" | ||
| VERSION="${TAG#*-}" | ||
| echo "version=${VERSION}" >> "${GITHUB_OUTPUT}" | ||
| - name: Deploy core docs | ||
| uses: matter-labs/deploy-mdbooks@73f638643d1be948d1002fe5433747f4a3e37a29 # v1 | ||
| with: | ||
| version: ${{ inputs.version || steps.extract-version.outputs.version || github.ref_name }} | ||
| docs-dir: ${{ env.DOCS_DIR }} | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| enable-tests: ${{ env.ENABLE_TESTS }} | ||
| project: ${{ env.PROJECT }} | ||
| deploy: ${{ github.event_name != 'pull_request' }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| name: Deploy prover docs | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - "main" | ||
| tags: | ||
| - "prover-v*.*.*" | ||
| paths: | ||
| - 'prover/docs/**' | ||
| - '.github/workflows/deploy-prover-docs.yml' | ||
| pull_request: | ||
| paths: | ||
| - 'prover/docs/**' | ||
| - '.github/workflows/deploy-prover-docs.yml' | ||
| workflow_dispatch: | ||
| inputs: | ||
| ref: | ||
| description: "Branch, tag or commit to deploy the prover docs. If empty, use the ref that triggered the workflow." | ||
| required: false | ||
| default: "" | ||
| version: | ||
| type: string | ||
| description: "Version of the documentation to deploy" | ||
| required: false | ||
| default: "latest" | ||
|
|
||
| # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued. | ||
| # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete. | ||
| concurrency: | ||
| group: "pages" | ||
| cancel-in-progress: false | ||
|
|
||
| jobs: | ||
|
|
||
| deploy-prover-docs: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: write | ||
| env: | ||
| DOCS_DIR: 'prover/docs' | ||
| PROJECT: 'prover' | ||
| ENABLE_TESTS: false | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 | ||
| with: | ||
| ref: ${{ inputs.ref || '' }} | ||
|
|
||
| - name: Extract version from tag | ||
| if: startsWith(github.ref, 'refs/tags/') | ||
| id: extract-version | ||
| shell: 'bash -ex {0}' | ||
| run: | | ||
| TAG="${{ github.ref_name }}" | ||
| VERSION="${TAG#*-}" | ||
| echo "version=${VERSION}" >> "${GITHUB_OUTPUT}" | ||
| - name: Deploy prover docs | ||
| uses: matter-labs/deploy-mdbooks@73f638643d1be948d1002fe5433747f4a3e37a29 # v1 | ||
| with: | ||
| version: ${{ inputs.version || steps.extract-version.outputs.version || github.ref_name }} | ||
| docs-dir: ${{ env.DOCS_DIR }} | ||
| github-token: ${{ secrets.GITHUB_TOKEN }} | ||
| enable-tests: ${{ env.ENABLE_TESTS }} | ||
| project: ${{ env.PROJECT }} | ||
| deploy: ${{ github.event_name != 'pull_request' }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.