Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix build for upstream-fef2098 #754

Merged
merged 24 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- main
- "*upstream*"
pull_request:
branches:
- main
- "*upstream*"

concurrency:
cancel-in-progress: true
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading
Loading