Skip to content

Commit

Permalink
Merge branch 'main' into 750-automate-stable-releases-for-installatio…
Browse files Browse the repository at this point in the history
…n-method-use
  • Loading branch information
antonbaliasnikov authored Dec 4, 2024
2 parents ec92248 + 0dcc03e commit 7cfdde2
Show file tree
Hide file tree
Showing 18 changed files with 1,270 additions and 1,126 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
6 changes: 6 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,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-github-hosted-16core
timeout-minutes: 60
Expand Down
Loading

0 comments on commit 7cfdde2

Please sign in to comment.