Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: fix build for upstream-fef2098 (#754)
Browse files Browse the repository at this point in the history
* deps: update zksync forks

chore: remove obsolete alloy patches

* fix: missing closing delimiter

* fix(eip712): implement missing `Transaction` fns

* fix: outdated import

* fix: respect borrowing rules

* fix(verify): specify "default" as comp profile

* refactor(eip712): use `PrimitiveSignature`

deps: remove unused `alloy_signer`

* fix(script): swapped `simulate` args

* chore: note over clippy lint

* fix(create:zk): pass `ArtifactId`

refactor(create:zk): `remove_zk_contract` more similar to upstream

* fix(eip712): retrieve proper v value

* fix(create:zk): use source path

* feat(ci): run ci on upstream merge PRs

* chore: fmt

* chore: switch to `sh_println`

* chore: fmt

* fix(test:zk): avoid initializing empty project

* feat(ci): switch to hosted runner

* fix(ci:zk): setup git config

* fix(ci): run test on all "upstream" branches

* fix(build): move empty files check in paths ext

* fix(ci): pin to ubuntu-22.04

* chore: revert inconsistent change

* chore: comment why `ecx_inner`
Karrq authored Dec 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 2af15c1 commit 6c7935c
Showing 21 changed files with 1,890 additions and 426 deletions.
26 changes: 16 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -4,9 +4,11 @@ on:
push:
branches:
- main
- "*upstream*"
pull_request:
branches:
- main
- "*upstream*"

concurrency:
cancel-in-progress: true
@@ -18,7 +20,7 @@ env:

jobs:
doctest:
runs-on: ubuntu-22.04-github-hosted-16core
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
@@ -33,7 +35,7 @@ jobs:

clippy:
name: clippy
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
@@ -46,7 +48,7 @@ jobs:
RUSTFLAGS: -Dwarnings

rustfmt:
runs-on: ubuntu-22.04-github-hosted-16core
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
@@ -57,7 +59,7 @@ jobs:
- run: cargo fmt --all --check

forge-fmt:
runs-on: ubuntu-22.04-github-hosted-16core
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
@@ -72,7 +74,7 @@ jobs:
run: ./.github/scripts/format.sh --check

codespell:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30
steps:
- uses: actions/checkout@v4
@@ -81,7 +83,7 @@ jobs:
skip: "*.json"

crate-checks:
runs-on: ubuntu-22.04-github-hosted-16core
runs-on: ubuntu-22.04
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
@@ -96,7 +98,7 @@ jobs:
run: cargo hack check

zk-cargo-test:
runs-on: ubuntu-22.04-github-hosted-16core
runs-on: ubuntu-22.04

steps:
- name: Checkout code
@@ -119,16 +121,20 @@ jobs:
logFilePath: era_test_node.log
target: x86_64-unknown-linux-gnu
releaseTag: v0.1.0-alpha.29

- name: Setup Git config
run: |
git config --global user.name "GitHub Actions Bot"
git config --global user.email "<>"
git config --global url."https://github.com/".insteadOf "[email protected]:"
- name: Run zk tests
env:
RUST_BACKTRACE: full
TEST_MAINNET_URL: http://localhost:8011
run: git config --global user.name "test-runner" && ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo test zk
run: ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo test zk

check-ci-install:
name: CI install
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- name: Install foundry-zksync
Loading

0 comments on commit 6c7935c

Please sign in to comment.