WIP

Author: pwltr

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

@@ -176,8 +176,16 @@ jobs:
           CHATWOOT_API: ${{ secrets.CHATWOOT_API }}
           E2E: true
         run: |
-          # Build with additional flags to handle asset catalog issues
-          echo "=== Attempting first build ==="
+          # 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 \
             -scheme Bitkit \
             -configuration Debug \
@@ -187,11 +195,16 @@ jobs:
             -skipPackagePluginValidation \
             -disableAutomaticPackageResolution \
             build; then
-            echo "✅ First build succeeded!"
+            echo "✅ Build succeeded without asset catalogs!"
           else
-            echo "❌ First build failed, trying fallback approach..."
+            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
             
-            # Fallback: Clean everything and try a simpler build
+            # Clean everything and try a simpler build
             echo "=== Cleaning for fallback build ==="
             rm -rf DerivedData
             rm -rf ~/Library/Developer/Xcode/DerivedData