WIP

Author: pwltr

.github/workflows/e2e-self-hosted.yml

@@ -105,119 +105,21 @@ jobs:
           # Reset package caches
           xcodebuild -resolvePackageDependencies -workspace Bitkit.xcodeproj/project.xcworkspace -scheme Bitkit
 
-      - name: Fix CoreSimulator asset catalog issue
-        run: |
-          # This is a CoreSimulator issue, not a CodeScanner issue
-          # The AssetCatalogSimulatorAgent can't communicate with the simulator
-          echo "=== Fixing CoreSimulator asset catalog issue ==="
-          
-          # Reset CoreSimulator services
-          echo "Resetting CoreSimulator services..."
-          sudo launchctl unload /System/Library/LaunchDaemons/com.apple.CoreSimulator.CoreSimulatorService.plist || true
-          sudo launchctl load /System/Library/LaunchDaemons/com.apple.CoreSimulator.CoreSimulatorService.plist || true
-          
-          # Kill any existing simulator processes
-          echo "Killing existing simulator processes..."
-          pkill -f "Simulator" || true
-          pkill -f "CoreSimulator" || true
-          pkill -f "AssetCatalogSimulatorAgent" || true
-          
-          # Wait for processes to fully terminate
-          sleep 5
-          
-          # Reset simulator state
-          echo "Resetting simulator state..."
-          xcrun simctl shutdown all || true
-          xcrun simctl erase all || true
-          
-          # Restart CoreSimulator daemon
-          echo "Restarting CoreSimulator daemon..."
-          sudo launchctl stop com.apple.CoreSimulator.CoreSimulatorService || true
-          sleep 2
-          sudo launchctl start com.apple.CoreSimulator.CoreSimulatorService || true
-          
-          # Wait for services to be ready
-          sleep 10
-          
-          echo "CoreSimulator reset complete"
-
-      - name: Reboot iOS Simulator
-        run: |
-          echo "=== Rebooting iOS Simulator after CoreSimulator reset ==="
-          
-          # Boot the simulator again
-          echo "Booting $SIMULATOR_NAME..."
-          xcrun simctl boot "$SIMULATOR_NAME" || true
-          
-          # Wait for simulator to boot
-          echo "Waiting for simulator to boot..."
-          for i in {1..30}; do
-            if xcrun simctl list devices | grep "$SIMULATOR_NAME" | grep -q "Booted"; then
-              echo "$SIMULATOR_NAME is booted!"
-              break
-            fi
-            echo "Waiting for $SIMULATOR_NAME boot... ($i/30)"
-            sleep 5
-          done
-          
-          # Additional wait for simulator to be fully ready
-          sleep 15
-          
-          # Launch simulator app to ensure it's visible
-          open -a Simulator
-          sleep 5
-          
-          echo "Simulator reboot complete"
-
       - name: Build iOS app
         env:
           GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CHATWOOT_API: ${{ secrets.CHATWOOT_API }}
           E2E: true
         run: |
-          # Try building without asset catalogs first
-          echo "=== Attempting build without asset catalogs ==="
-          
-          # Remove CodeScanner asset catalog to bypass the issue
-          CODESCANNER_ASSETS_PATH="DerivedData/SourcePackages/checkouts/CodeScanner/Sources/CodeScanner/Resources/Assets.xcassets"
-          if [ -d "$CODESCANNER_ASSETS_PATH" ]; then
-            echo "Temporarily removing CodeScanner Assets.xcassets to bypass compilation issue..."
-            mv "$CODESCANNER_ASSETS_PATH" "$CODESCANNER_ASSETS_PATH.backup" || true
-          fi
-          
-          if xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
+          echo "=== Building iOS app ==="
+          xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
             -scheme Bitkit \
             -configuration Debug \
             -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
             -derivedDataPath DerivedData \
             -allowProvisioningUpdates \
-            -skipPackagePluginValidation \
-            -disableAutomaticPackageResolution \
-            build; then
-            echo "✅ Build succeeded without asset catalogs!"
-          else
-            echo "❌ Build failed, trying with asset catalogs restored..."
-            
-            # Restore asset catalog and try again
-            if [ -d "$CODESCANNER_ASSETS_PATH.backup" ]; then
-              mv "$CODESCANNER_ASSETS_PATH.backup" "$CODESCANNER_ASSETS_PATH" || true
-            fi
-            
-            # Clean everything and try a simpler build
-            echo "=== Cleaning for fallback build ==="
-            rm -rf DerivedData
-            rm -rf ~/Library/Developer/Xcode/DerivedData
-            
-            echo "=== Attempting fallback build ==="
-            xcodebuild -workspace Bitkit.xcodeproj/project.xcworkspace \
-              -scheme Bitkit \
-              -configuration Debug \
-              -destination 'platform=iOS Simulator,name=iPhone 16,OS=latest' \
-              -derivedDataPath DerivedData \
-              -allowProvisioningUpdates \
-              build
-          fi
+            build
 
       - name: Prepare app for E2E tests
         run: |