diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cca76a9f1240..e5f64c1dfd50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -215,7 +215,10 @@ jobs: matrix: include: - os: ubuntu-latest + # defaults to x86_64-apple-darwin - os: macos-latest + - os: macos-latest + target: aarch64-apple-darwin - os: windows-2019 - os: windows-2019 target: x86_64-pc-windows-gnu @@ -390,6 +393,9 @@ jobs: os: ubuntu-latest - build: x86_64-macos os: macos-latest + - build: aarch64-macos + os: macos-latest + target: aarch64-apple-darwin - build: x86_64-windows os: windows-latest - build: x86_64-mingw diff --git a/.github/workflows/release-process.yml b/.github/workflows/release-process.yml index d35b6d8402ee..07da0ab9d52d 100644 --- a/.github/workflows/release-process.yml +++ b/.github/workflows/release-process.yml @@ -79,6 +79,9 @@ jobs: PRs to the \`main\` branch to update [RELEASES.md] and then backport these PRs to the [release branch][branch]. + Maintainers should also review that aarch64-apple-darwin builds + are passing via [embark's CI](https://buildkite.com/embark-studios/wasmtime-aarch64-apple-darwin). + Another automated PR will be made in roughly 2 weeks time when for the actual release itself. diff --git a/ci/build-tarballs.sh b/ci/build-tarballs.sh index 6fd67d06a83a..00e6352fece3 100755 --- a/ci/build-tarballs.sh +++ b/ci/build-tarballs.sh @@ -52,7 +52,7 @@ elif [ "$platform" = "x86_64-mingw" ]; then cp target/x86_64-pc-windows-gnu/release/wasmtime.exe tmp/$bin_pkgname cp target/x86_64-pc-windows-gnu/release/{wasmtime.dll,libwasmtime.a,libwasmtime.dll.a} tmp/$api_pkgname/lib fmt=zip -elif [ "$platform" = "x86_64-macos" ]; then +elif [ "$platform" = "x86_64-macos" ] || [ "$platform" = "aarch64-macos" ]; then # Postprocess the macOS dylib a bit to have a more reasonable `LC_ID_DYLIB` # directive than the default one that comes out of the linker when typically # doing `cargo build`. For more info see #984