diff --git a/.github/actions/macos/action.yml b/.github/actions/macos/action.yml index b28eb14..efb643e 100644 --- a/.github/actions/macos/action.yml +++ b/.github/actions/macos/action.yml @@ -23,4 +23,4 @@ runs: retention-days: 14 path: | *.dylib - *.macos.a + *.a diff --git a/dart/test/utils/native_test_utils.dart b/dart/test/utils/native_test_utils.dart index b934efe..a8e6281 100644 --- a/dart/test/utils/native_test_utils.dart +++ b/dart/test/utils/native_test_utils.dart @@ -65,8 +65,8 @@ String resolvePowerSyncLibrary() { return p.join( prefix, switch (Abi.current()) { - Abi.macosX64 => 'libpowersync_x64.dylib', - Abi.macosArm64 => 'libpowersync_aarch64.dylib', + Abi.macosX64 => 'libpowersync_x64.macos.dylib', + Abi.macosArm64 => 'libpowersync_aarch64.macos.dylib', Abi.windowsX64 => 'powersync_x64.dll', Abi.windowsArm64 => 'powersync_aarch64.dll', Abi.linuxX64 => 'libpowersync_x64.so', diff --git a/tool/build_macos.sh b/tool/build_macos.sh index d1d25db..7aca834 100755 --- a/tool/build_macos.sh +++ b/tool/build_macos.sh @@ -4,16 +4,27 @@ set -e function compile() { local triple=$1 local suffix=$2 + local os=$3 cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --release --target $triple cargo build -p powersync_static -Z build-std=panic_abort,core,alloc --release --target $triple - mv "target/$triple/release/libpowersync.dylib" "libpowersync_$suffix.dylib" - mv "target/$triple/release/libpowersync.a" "libpowersync_$suffix.macos.a" + mv "target/$triple/release/libpowersync.dylib" "libpowersync_$suffix.$os.dylib" + mv "target/$triple/release/libpowersync.a" "libpowersync_$suffix.$os.a" } -if [ "$1" = "x64" ]; then - compile x86_64-apple-darwin x64 -else - compile aarch64-apple-darwin aarch64 -fi +case "$1" in + x64) + compile x86_64-apple-darwin x64 macos + compile x86_64-apple-ios x64 ios-sim + ;; + aarch64) + compile aarch64-apple-darwin aarch64 macos + compile aarch64-apple-ios-sim aarch64 ios-sim + compile aarch64-apple-ios aarch64 ios + ;; + *) + echo "Unknown architecture" + exit 1; + ;; +esac