diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 756a160..6a5c64a 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -61,15 +61,17 @@ jobs: arch: x86_64 ios_simulator: true - - name: Simulator Lib (arm64, release) - target: template_release - arch: arm64 - ios_simulator: true + # ! Disabled for now as it doesn't work with cctools-port and current LLVM. + # * See https://github.com/godotengine/build-containers/pull/85. + # - name: Simulator Lib (arm64, release) + # target: template_release + # arch: arm64 + # ios_simulator: true - - name: Simulator Lib (arm64, debug) - target: template_debug - arch: arm64 - ios_simulator: true + # - name: Simulator Lib (arm64, debug) + # target: template_debug + # arch: arm64 + # ios_simulator: true env: BIN: godot.ios.${{matrix.target}}.${{matrix.arch}} @@ -163,10 +165,12 @@ jobs: strip *.a mv libgodot.ios.template_debug.arm64.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64/libgodot.a - lipo -create libgodot.ios.template_debug.arm64.simulator.a libgodot.ios.template_debug.x86_64.simulator.a -output ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a + # ! lipo -create libgodot.ios.template_debug.arm64.simulator.a libgodot.ios.template_debug.x86_64.simulator.a -output ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a + mv libgodot.ios.template_debug.x86_64.simulator.a ios_xcode/libgodot.ios.debug.xcframework/ios-arm64_x86_64-simulator/libgodot.a mv libgodot.ios.template_release.arm64.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64/libgodot.a - lipo -create libgodot.ios.template_release.arm64.simulator.a libgodot.ios.template_release.x86_64.simulator.a -output ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a + # ! lipo -create libgodot.ios.template_release.arm64.simulator.a libgodot.ios.template_release.x86_64.simulator.a -output ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a + mv libgodot.ios.template_release.x86_64.simulator.a ios_xcode/libgodot.ios.release.xcframework/ios-arm64_x86_64-simulator/libgodot.a cp -r ~/VulkanSDK/*/MoltenVK/MoltenVK.xcframework ios_xcode rm -rf ios_xcode/MoltenVK.xcframework/{macos,tvos}*