From 4abae83aa4d7daf8b76eca946723023de10f875f Mon Sep 17 00:00:00 2001
From: Jonas Vautherin <jonas.vautherin@gmail.com>
Date: Tue, 24 Nov 2020 19:15:07 +0100
Subject: [PATCH] Artifact is now mavsdk_server.xcframework.zip instead of
 mavsdk_server_ios.zip

---
 .github/workflows/main.yml                       | 6 +++---
 src/backend/tools/package_backend_framework.bash | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4935fd11a..b09d19f918 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -445,7 +445,7 @@ jobs:
         run: bash ./src/backend/tools/package_backend_framework.bash
       - uses: actions/upload-artifact@v2
         with:
-          name: mavsdk_server_ios.xcframework
+          name: mavsdk_server.xcframework
           path: ./build/mavsdk_server.xcframework
           retention-days: 2
       - name: Publish artefacts
@@ -453,8 +453,8 @@ jobs:
         uses: svenstaro/upload-release-action@v1-release
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: 'build/mavsdk_server.zip'
-          asset_name: 'mavsdk_server_ios.zip'
+          file: 'build/mavsdk_server.xcframework.zip'
+          asset_name: 'mavsdk_server.xcframework.zip'
           tag: ${{ github.ref }}
           overwrite: true
 
diff --git a/src/backend/tools/package_backend_framework.bash b/src/backend/tools/package_backend_framework.bash
index 2726eee457..1be13ad19c 100644
--- a/src/backend/tools/package_backend_framework.bash
+++ b/src/backend/tools/package_backend_framework.bash
@@ -14,12 +14,12 @@ if [ -d ${BUILD_DIR}/mavsdk_server.xcframework ]; then
 fi
 
 echo "Fixing Modules in macOS framework"
-ln -s Versions/Current/Modules ${MACOS_BACKEND_DIR}/mavsdk_server.framework
+ln -sf Versions/Current/Modules ${MACOS_BACKEND_DIR}/mavsdk_server.framework
 
 echo "Creating xcframework..."
 xcodebuild -create-xcframework -framework ${IOS_BACKEND_DIR}/mavsdk_server.framework -framework ${IOS_SIM_BACKEND_DIR}/mavsdk_server.framework -framework ${MACOS_BACKEND_DIR}/mavsdk_server.framework -output ${BUILD_DIR}/mavsdk_server.xcframework
 
 cd ${BUILD_DIR}
-zip -9 -r mavsdk_server.zip mavsdk_server.xcframework
+zip -9 -r mavsdk_server.xcframework.zip mavsdk_server.xcframework
 
 echo "Success! You will find the xcframework in ${BUILD_DIR}!"