-
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 kl/fact…
…ory-migration-fix-4
- Loading branch information
Showing
553 changed files
with
14,557 additions
and
9,082 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,4 +1,4 @@ | ||
| { | ||
| "core": "23.1.0", | ||
| "prover": "13.0.0" | ||
| "core": "24.1.0", | ||
| "prover": "14.0.0" | ||
| } |
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,54 @@ | ||
| on: | ||
| push: | ||
| branches: | ||
| - release-please--branches--main--components--core | ||
|
|
||
| name: release-please-update-cargo-lock | ||
| jobs: | ||
| update_cargo_lock: | ||
| runs-on: [matterlabs-ci-runner] | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3 | ||
| with: | ||
| submodules: "recursive" | ||
| persist-credentials: false | ||
|
|
||
| - name: Check last commit | ||
| id: condition | ||
| run: | | ||
| COMMIT=$(git log -1 --pretty=%B) | ||
| if [[ "$COMMIT" == "Update Cargo.lock" ]]; then | ||
| echo "Cargo.lock is already updated" | ||
| echo "::set-output name=skip_steps::true" | ||
| else | ||
| echo "Cargo.lock should be updated" | ||
| echo "::set-output name=skip_steps::false" | ||
| fi | ||
| - name: Setup environment | ||
| if: steps.condition.outputs.skip_steps != 'true' | ||
| run: | | ||
| echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV | ||
| echo $(pwd)/bin >> $GITHUB_PATH | ||
| echo IN_DOCKER=1 >> .env | ||
| - name: Start services | ||
| if: steps.condition.outputs.skip_steps != 'true' | ||
| run: docker compose up -d zk | ||
|
|
||
| - name: Cargo check | ||
| if: steps.condition.outputs.skip_steps != 'true' | ||
| run: ci_run cargo check | ||
|
|
||
| - name: Push changes | ||
| if: steps.condition.outputs.skip_steps != 'true' | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} | ||
| run: | | ||
| git config --global user.email "zksync-era-bot@users.noreply.github.com" | ||
| git config --global user.name "zksync-era-bot" | ||
| git remote set-url origin 'https://${{ secrets.RELEASE_TOKEN }}@github.com/matter-labs/zksync-era.git' | ||
| git add ./Cargo.lock | ||
| git commit -m "Update Cargo.lock" | ||
| git push |
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,34 @@ | ||
| name: Release stable EN image | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| tag_name: | ||
| description: "Tag of an image" | ||
| type: string | ||
| required: true | ||
|
|
||
| jobs: | ||
| release: | ||
| runs-on: [matterlabs-ci-runner] | ||
| steps: | ||
| - name: Login to Docker registries | ||
| run: docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }} | ||
|
|
||
| - name: Check if alpha image exists | ||
| run: | | ||
| set +e | ||
| docker manifest inspect matterlabs/external-node:${{ inputs.tag_name }}-alpha >/dev/null 2>&1 | ||
| exitcode=$? | ||
| set -e | ||
| if [[ "$exitcode" -eq "1" ]]; then | ||
| echo "Image matterlabs/external-node:${{ inputs.tag_name }} doesn't exist" | ||
| exit 1 | ||
| fi | ||
| - name: Push stable image | ||
| run: | | ||
| docker pull matterlabs/external-node:${{ inputs.tag_name }}-alpha | ||
| docker tag matterlabs/external-node:${{ inputs.tag_name }}-alpha \ | ||
| matterlabs/external-node:${{ inputs.tag_name }} | ||
| docker push matterlabs/external-node:${{ inputs.tag_name }} |
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 |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| lib/ | ||
| # Ignore contract submodules | ||
| contracts | ||
| contracts |
Oops, something went wrong.