fix: Address flaky dispatch

.github/workflows/common.yml

@@ -52,6 +52,12 @@ on:
         required: false
         default: ""
 
+      # Additional flags to pass to xcodebuild.
+      xcodebuild_flags:
+        type: string
+        required: false
+        default: ""
+
     outputs:
       cache_key:
         description: "The cache key for the Swift package resolution."
@@ -114,6 +120,8 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
       if: contains(join(inputs.platforms), matrix.platform) || matrix.os == 'macos-14'
+      env:
+        XCODEBUILD_FLAGS: ${{ inputs.xcodebuild_flags }}
       with:
         timeout_minutes: 15
         max_attempts: 3

.github/workflows/crashlytics.yml

@@ -30,6 +30,7 @@ jobs:
     uses: ./.github/workflows/common.yml
     with:
       target: FirebaseCrashlyticsUnit
+      xcodebuild_flags: "GCC_PREPROCESSOR_DEFINITIONS='$(inherited) FIREBASE_CRASHYLTICS_TESTING=1'"
 
   catalyst:
     uses: ./.github/workflows/common_catalyst.yml

Crashlytics/Crashlytics/Models/FIRCLSSettings.m

@@ -190,15 +190,21 @@
 
 - (void)deleteCachedSettings {
   __weak FIRCLSSettings *weakSelf = self;
+#ifndef FIREBASE_CRASHYLTICS_TESTING
+#error "Mango: Check one."
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_BACKGROUND, 0), ^{
+#endif
     __strong FIRCLSSettings *strongSelf = weakSelf;
     if ([strongSelf.fileManager fileExistsAtPath:strongSelf.fileManager.settingsFilePath]) {
       [strongSelf.fileManager removeItemAtPath:strongSelf.fileManager.settingsFilePath];
     }
     if ([strongSelf.fileManager fileExistsAtPath:strongSelf.fileManager.settingsCacheKeyPath]) {
       [strongSelf.fileManager removeItemAtPath:strongSelf.fileManager.settingsCacheKeyPath];
     }
+#ifndef FIREBASE_CRASHYLTICS_TESTING
+#error "Mango: Check two."
   });
+#endif
 
   @synchronized(self) {
     self.isCacheKeyExpired = YES;

scripts/build.sh

@@ -255,6 +255,11 @@ xcb_flags+=(
   COMPILER_INDEX_STORE_ENABLE=NO
 )
 
+if [[ -n "${XCODEBUILD_FLAGS:-}" ]]; then
+  echo "Appending XCODEBUILD_FLAGS: ${XCODEBUILD_FLAGS}"
+  xcb_flags+=("${XCODEBUILD_FLAGS}")
+fi
+
 source scripts/buildcache.sh
 xcb_flags=("${xcb_flags[@]}" "${buildcache_xcb_flags[@]}")