diff --git a/.github/workflows/deploy-appstore.yml b/.github/workflows/deploy-appstore.yml index 21b7244..9fc9468 100644 --- a/.github/workflows/deploy-appstore.yml +++ b/.github/workflows/deploy-appstore.yml @@ -15,14 +15,20 @@ jobs: - name: Select Xcode run: | - echo "Available Xcode versions:" - ls -d /Applications/Xcode*.app - XCODE=$(ls -d /Applications/Xcode_26*.app 2>/dev/null | sort -V | tail -1) - if [ -z "$XCODE" ]; then - XCODE=$(ls -d /Applications/Xcode*.app 2>/dev/null | sort -V | tail -1) + XCODE_26=$(ls -d /Applications/Xcode_26*.app 2>/dev/null | sort -V | tail -1) + XCODE_16=$(ls -d /Applications/Xcode_16*.app 2>/dev/null | sort -V | tail -1) + echo "Xcode 26: $XCODE_26" + echo "Xcode 16: $XCODE_16" + + # Xcode 26 betas on GitHub runners are missing the MacOSX platform. + # Symlink the entire platform from Xcode 16 so actool and other host tools work. + MACOS_PLATFORM="$XCODE_26/Contents/Developer/Platforms/MacOSX.platform" + if [ ! -d "$MACOS_PLATFORM" ]; then + echo "Symlinking MacOSX.platform from Xcode 16 into Xcode 26" + sudo ln -s "$XCODE_16/Contents/Developer/Platforms/MacOSX.platform" "$MACOS_PLATFORM" fi - echo "Using: $XCODE" - sudo xcode-select -s "$XCODE/Contents/Developer" + + sudo xcode-select -s "$XCODE_26/Contents/Developer" xcodebuild -version - name: Setup .NET @@ -69,7 +75,8 @@ jobs: -p:ArchiveOnBuild=true \ -p:RuntimeIdentifier=ios-arm64 \ -p:CodesignKey="${{ secrets.CODESIGN_KEY_NAME }}" \ - -p:CodesignProvision="${{ secrets.PROVISIONING_PROFILE_NAME }}" + -p:CodesignProvision="${{ secrets.PROVISIONING_PROFILE_NAME }}" \ + -p:MtouchUseLlvm=false - name: Upload to App Store Connect env: