From 535576dc8651e4e5cc8807c6eb3c9995c690a464 Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Mon, 5 Aug 2024 15:02:16 +1200 Subject: [PATCH] CI: fixup symlinks macOS tooling shifting from under you, it doesn't get much worse than that. --- .../tools/package_mavsdk_server_framework.bash | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mavsdk_server/tools/package_mavsdk_server_framework.bash b/src/mavsdk_server/tools/package_mavsdk_server_framework.bash index 88dd8e5c9..f1b87ab0a 100644 --- a/src/mavsdk_server/tools/package_mavsdk_server_framework.bash +++ b/src/mavsdk_server/tools/package_mavsdk_server_framework.bash @@ -23,6 +23,9 @@ fi echo "Running lipo for simulator" mkdir -p ${IOS_SIM_FAT_BACKEND_DIR} cp -a ${IOS_SIM_X64_BACKEND_DIR}/mavsdk_server.framework ${IOS_SIM_FAT_BACKEND_DIR} +file ${IOS_SIM_X64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server +file ${IOS_SIM_ARM64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server + xcrun lipo -create -output ${IOS_SIM_FAT_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server \ ${IOS_SIM_X64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server \ ${IOS_SIM_ARM64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server @@ -37,6 +40,12 @@ xcrun codesign --verbose --sign - ${IOS_SIM_FAT_BACKEND_DIR}/mavsdk_server.frame echo "Running lipo for macos" mkdir -p ${MACOS_FAT_BACKEND_DIR} cp -a ${MACOS_X64_BACKEND_DIR}/mavsdk_server.framework ${MACOS_FAT_BACKEND_DIR} +# Fix up symlinks that seem to break when github artifacts unzips the archives +ln -s -f ${MACOS_X64_BACKEND_DIR}/mavsdk_server.framework/Versions/Current/mavsdk_server ${MACOS_X64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server +ln -s -f ${MACOS_ARM64_BACKEND_DIR}/mavsdk_server.framework/Versions/Current/mavsdk_server ${MACOS_ARM64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server +file ${MACOS_X64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server +file ${MACOS_ARM64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server + xcrun lipo -create -output ${MACOS_FAT_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server \ ${MACOS_X64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server \ ${MACOS_ARM64_BACKEND_DIR}/mavsdk_server.framework/mavsdk_server