debug

Author: HarelM

.github/workflows/ci.yml

@@ -132,8 +132,42 @@ jobs:
           npm ci
           npm run build:mobile -- --no-progress
           npx cap sync ios
+
+      # The cloned packages and their binary artifacts are ~250MB of prebuilt
+      # xcframeworks. Restore and save are split rather than using actions/cache,
+      # which only saves when the whole job succeeds - the cache should persist even
+      # if the build step later fails.
+      - name: Restore Swift package cache
+        id: spm-cache
+        uses: actions/cache/restore@v4
+        with:
+          path: IsraelHiking.Web/ios/.spm-cache
+          key: spm-${{ runner.os }}-${{ hashFiles('IsraelHiking.Web/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
+          restore-keys: spm-${{ runner.os }}-
+
+      # Resolve up front. Left to fastlane, this download happens inside
+      # xcodebuild -showBuildSettings, whose output fastlane captures - so it is
+      # invisible and trips the build-settings timeout. Must run after `npm ci`, since
+      # the plugin packages are path references into node_modules.
+      - name: Resolve Swift packages
+        timeout-minutes: 20
+        run: |
+          cd IsraelHiking.Web/ios/App
+          time xcodebuild -resolvePackageDependencies \
+            -project App.xcodeproj \
+            -clonedSourcePackagesDirPath ../.spm-cache
+          du -sh ../.spm-cache ../.spm-cache/artifacts
+
+      - name: Save Swift package cache
+        if: steps.spm-cache.outputs.cache-hit != 'true'
+        uses: actions/cache/save@v4
+        with:
+          path: IsraelHiking.Web/ios/.spm-cache
+          key: spm-${{ runner.os }}-${{ hashFiles('IsraelHiking.Web/ios/App/App.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved') }}
+
       - name: Build iOS with signing
         if: ${{ github.secret_source == 'Actions' }}
+        timeout-minutes: 25
         run: |
           cd IsraelHiking.Web/ios/App
           bundle exec fastlane build_ios

IsraelHiking.Web/ios/App/fastlane/Fastfile

@@ -28,17 +28,6 @@ platform :ios do
     # Where CI resolved the packages. Derived from this file's own location rather
     # than an env var or lane argument, both of which have silently arrived empty.
     spm_cache = options[:spm_cache] || File.expand_path("../../.spm-cache", __dir__)
-    # TEMPORARY DIAGNOSTIC. The identical command runs in seconds in the workflow's
-    # resolve step, but hangs when build_app runs it here. The only remaining
-    # difference is that this point is after setup_ci swapped the default keychain.
-    # Running it ourselves, streamed, tells us which side the stall is on.
-    # NB: fastlane's `sh` runs in the fastlane/ directory, so cd to the project first.
-    sh("cd #{File.expand_path('..', __dir__).shellescape} && date +%T && " \
-       "xcodebuild -showBuildSettings -scheme App -project App.xcodeproj " \
-       "-clonedSourcePackagesDirPath #{spm_cache.shellescape} " \
-       "-disableAutomaticPackageResolution -skipPackageUpdates " \
-       "-destination 'generic/platform=iOS' > /dev/null; " \
-       "echo \"exit=$?\"; date +%T")
     build_app(
       project: "App.xcodeproj",
       scheme: "App",