Skip to content

Commit

Permalink
Merge pull request #768 from matter-labs/upstream-fef2098-main-update
Browse files Browse the repository at this point in the history
chore: merge `main` into `upstream-fef2098`
  • Loading branch information
Karrq authored Dec 5, 2024
2 parents 6c7935c + f9f30e3 commit 6c1c4ba
Show file tree
Hide file tree
Showing 41 changed files with 930 additions and 1,631 deletions.
5 changes: 3 additions & 2 deletions .github/scripts/matrices.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ def __init__(
# TODO: Figure out how to make this work
# t_linux_arm = Target("ubuntu-latest", "aarch64-unknown-linux-gnu", "linux-aarch64")
t_macos = Target("macos-latest", "aarch64-apple-darwin", "macosx-aarch64")
t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
targets = [t_linux_x86, t_windows] if is_pr else [t_linux_x86, t_macos, t_windows]
# NOTE(zk): ZKsync-era doesn't support windows as of now
# t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
targets = [t_linux_x86] if is_pr else [t_linux_x86, t_macos]

config = [
Case(
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ env:
TARGET_RUST_VERSION: "nightly-2024-09-01"

jobs:
nextest:
uses: ./.github/workflows/nextest.yml
with:
profile: default
secrets: inherit

doctest:
runs-on: ubuntu-22.04
timeout-minutes: 60
Expand Down Expand Up @@ -83,7 +89,8 @@ jobs:
skip: "*.json"

crate-checks:
runs-on: ubuntu-22.04
# ubuntu-22.04 runs out of disk space
runs-on: ubuntu-22.04-github-hosted-16core
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -112,6 +119,9 @@ jobs:
with:
toolchain: ${{ env.TARGET_RUST_VERSION }}

- name: Install cargo-nextest
uses: taiki-e/install-action@nextest

- name: Run era-test-node
uses: dutterbutter/era-test-node-action@v1
with:
Expand All @@ -130,7 +140,8 @@ jobs:
env:
RUST_BACKTRACE: full
TEST_MAINNET_URL: http://localhost:8011
run: ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo test zk
run: |
ZK_DEBUG_HISTORICAL_BLOCK_HASHES=5 cargo nextest run --package '*' --lib --test '*' --filter-expr 'test(~zk)'
check-ci-install:
name: CI install
Expand Down
Loading

0 comments on commit 6c1c4ba

Please sign in to comment.