Merge remote-tracking branch 'origin' into test-progress

foundry-rs · Jun 5, 2024 · 6233ae6 · 6233ae6
2 parents efe5a22 + fb86e5d
commit 6233ae6
Show file tree

Hide file tree

Showing 103 changed files with 2,013 additions and 1,451 deletions.
diff --git a/.github/scripts/matrices.py b/.github/scripts/matrices.py
@@ -69,7 +69,7 @@ def __init__(
 t_linux_x86 = Target("ubuntu-latest", "x86_64-unknown-linux-gnu", "linux-amd64")
 # 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", "x86_64-apple-darwin", "macosx-amd64")
+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]
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -88,7 +88,7 @@ jobs:
                       svm_target_platform: linux-aarch64
                       platform: linux
                       arch: arm64
-                    - runner: macos-latest-large
+                    - runner: macos-12-large
                       target: x86_64-apple-darwin
                       svm_target_platform: macosx-amd64
                       platform: darwin