diff --git a/.github/workflows/arch_dylib_sign.json b/.github/workflows/arch_dylib_sign.json index 695ec5c41e7..29012a77434 100644 --- a/.github/workflows/arch_dylib_sign.json +++ b/.github/workflows/arch_dylib_sign.json @@ -1,6 +1,7 @@ { "source": [ "target/aarch64-apple-darwin/release/libmirrord_layer.dylib", + "target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib", "target/x86_64-apple-darwin/release/libmirrord_layer.dylib" ], "bundle_id": "com.metalbear.mirrord", diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 418e3734d3a..827cb3907ba 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -63,8 +63,9 @@ jobs: # >> magic bits: 0000000 facf feed 000c 0100 0002 0000 0006 0000 # >> target/debug/libmirrord_layer.dylib: Mach-O 64-bit dynamically linked shared library arm64e run: | - cargo +nightly build --release -p mirrord-layer --target=aarch64-apple-darwin - printf '\x02' | dd of=target/aarch64-apple-darwin/release/libmirrord_layer.dylib bs=1 seek=8 count=1 conv=notrunc + cargo +nightly build --release -p mirrord-layer --target=aarch64-apple-darwin + cp target/aarch64-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib + printf '\x02' | dd of=target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib bs=1 seek=8 count=1 conv=notrunc - name: Sign layer binaries env: AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }} @@ -73,7 +74,7 @@ jobs: - name: create universal target dir run: mkdir -p /tmp/target/universal-apple-darwin/release - name: create universal dylib - run: lipo -create -output /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/libmirrord_layer.dylib target/x86_64-apple-darwin/release/libmirrord_layer.dylib + run: lipo -create -output /tmp/target/universal-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/libmirrord_layer.dylib target/x86_64-apple-darwin/release/libmirrord_layer.dylib target/aarch64-apple-darwin/release/libmirrord_layer_arm64e.dylib - name: Sign layer universal env: AC_USERNAME: ${{ secrets.APPLE_DEVELOPER }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1de5d02b1ec..4372a9280dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how ### Changed - Ignore http tests because they are unstable, and they block the CI. +- Bundle arm64 binary into the universal binary for MacOS. ## 3.0.8-alpha