ci(fix): create archive for libwallet-ios-xcframework (#5191)

Description xcframework is a collection of files, at release - move files into an archive. Also fixed some types iso -> ios Motivation and Context Make it easier for iOS developer to get the xcframework How Has This Been Tested? Build locally and in fork. browncoat confirm he is happy too.
tari-project · Feb 20, 2023 · 2a92fa4 · 2a92fa4
1 parent 44c0526
commit 2a92fa4
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git a/.github/workflows/build_libwallets.yml b/.github/workflows/build_libwallets.yml
@@ -113,6 +113,21 @@ jobs:
             -exec sed -i -e "s/libwallet-.*\///g" '{}' \;
           ls -alht
 
+      - name: Archive libwallet-ios-xcframework
+        shell: bash
+        working-directory: libwallets
+        run: |
+          ls -alht
+          if [ -d libwallet-ios-xcframework ]; then
+            #zip -j libtari_wallet_ffi.ios-xcframework.zip libwallet-ios-xcframework/*
+            7z a libtari_wallet_ffi.ios-xcframework.zip libwallet-ios-xcframework/*
+            rm -fr libwallet-ios-xcframework/*
+            shasum -a 256 \
+              "libtari_wallet_ffi.ios-xcframework.zip" \
+              > "libtari_wallet_ffi.ios-xcframework.zip.sha256sums"
+          fi
+          ls -alht
+
       - name: Create release
         uses: ncipollo/release-action@v1
         with:

diff --git a/.github/workflows/build_libwallets_workflow.yml b/.github/workflows/build_libwallets_workflow.yml
@@ -136,12 +136,12 @@ jobs:
           echo "target_platform=${target_platform}" >> $GITHUB_ENV
           mkdir -p "${{ runner.temp }}/libwallet-ios-${target_platform}"
           cd "${{ runner.temp }}/libwallet-ios-${target_platform}"
-          cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libtari_wallet_ffi.a" "libtari_wallet_ffi.iso_${target_platform}.a"
+          cp -v "$GITHUB_WORKSPACE/target/${{ matrix.build }}/release/libtari_wallet_ffi.a" "libtari_wallet_ffi.ios_${target_platform}.a"
           cp -v "$GITHUB_WORKSPACE/base_layer/wallet_ffi/wallet.h" libtari_wallet_ffi.h
           cp -v "$GITHUB_WORKSPACE/changelog.md" .
           cd ..
           shasum -a 256 \
-            "libwallet-ios-${target_platform}/libtari_wallet_ffi.iso_${target_platform}.a" \
+            "libwallet-ios-${target_platform}/libtari_wallet_ffi.ios_${target_platform}.a" \
             "libwallet-ios-${target_platform}/libtari_wallet_ffi.h" \
               > "libwallet-ios-${target_platform}/libtari_wallet_ffi.ios_${target_platform}.sha256sums"
           ls -alht "${{ runner.temp }}/libwallet-ios-${target_platform}"
@@ -190,8 +190,8 @@ jobs:
           cp -v "libwallet-ios-x86_64/changelog.md" \
             libwallet-ios-universal/
           lipo -create \
-            "libwallet-ios-x86_64/libtari_wallet_ffi.iso_x86_64.a" \
-            "libwallet-ios-aarch64/libtari_wallet_ffi.iso_aarch64.a" \
+            "libwallet-ios-x86_64/libtari_wallet_ffi.ios_x86_64.a" \
+            "libwallet-ios-aarch64/libtari_wallet_ffi.ios_aarch64.a" \
               -output "libwallet-ios-universal/libtari_wallet_ffi.ios_universal.a"
           shasum -a 256 \
             "libwallet-ios-universal/libtari_wallet_ffi.ios_universal.a" \
@@ -212,22 +212,22 @@ jobs:
           ls -alht
           mkdir libwallet-ios-universal-sim
           lipo -create \
-            "libwallet-ios-x86_64/libtari_wallet_ffi.iso_x86_64.a" \
-            "libwallet-ios-aarch64-sim/libtari_wallet_ffi.iso_aarch64-sim.a" \
+            "libwallet-ios-x86_64/libtari_wallet_ffi.ios_x86_64.a" \
+            "libwallet-ios-aarch64-sim/libtari_wallet_ffi.ios_aarch64-sim.a" \
               -output "libwallet-ios-universal-sim/libtari_wallet_ffi.ios_universal-sim.a"
           mkdir libwallet-ios-xcframework
           cp -v "libwallet-ios-x86_64/changelog.md" \
             libwallet-ios-xcframework/
           xcodebuild -create-xcframework \
             -library "libwallet-ios-universal-sim/libtari_wallet_ffi.ios_universal-sim.a" \
               -headers "libwallet-ios-x86_64/libtari_wallet_ffi.h" \
-            -library "libwallet-ios-aarch64/libtari_wallet_ffi.iso_aarch64.a" \
+            -library "libwallet-ios-aarch64/libtari_wallet_ffi.ios_aarch64.a" \
               -headers "libwallet-ios-aarch64/libtari_wallet_ffi.h" \
             -output libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework
           shasum -a 256 \
             "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/Info.plist" \
             "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64/Headers" \
-            "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64/libtari_wallet_ffi.iso_aarch64.a" \
+            "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64/libtari_wallet_ffi.ios_aarch64.a" \
             "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/Headers" \
             "libwallet-ios-xcframework/libtari_wallet_ffi_ios.xcframework/ios-arm64_x86_64-simulator/libtari_wallet_ffi.ios_universal-sim.a" \
               > "libwallet-ios-xcframework/libtari_wallet_ffi.ios_xcframework.sha256sums"