Skip to content

Commit

Permalink
Bumping FBSimulatorControl to fix conveyor
Browse files Browse the repository at this point in the history
Summary:
The conveyor for idb_companion has stopped working and there have been several fixes to get it running correctly again. This diff updates an out of date comment to bump FBSimulatorControl and trigger the conveyor.

Part of the ongoing resolution of S437790.

Differential Revision: D61540194

fbshipit-source-id: ec26a6c516047b9153d20e0179c93248e5d312c8
  • Loading branch information
fbgerrit authored and facebook-github-bot committed Aug 20, 2024
1 parent 8fca8b3 commit d2e4bfb
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CompanionLib/Utility/FBIDBStorageManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,17 @@ - (BOOL)checkArchitecture:(FBBundleDescriptor *)bundle error:(NSError **)error
NSSet<FBArchitecture> *binaryArchitectures = bundle.binary.architectures;
NSArray<FBArchitecture> *targetArchs = self.target.architectures;
NSSet<FBArchitecture> *supportedArchitectures = [FBiOSTargetConfiguration baseArchsToCompatibleArch:targetArchs];

const BOOL containsExactArch = [binaryArchitectures intersectsSet:supportedArchitectures];
// arm64 binaries are acceptable on arm64e devices, but arm64e is not yet available
// arm64 binaries are acceptable on arm64e devices
const BOOL arm64eEquivalent = [targetArchs containsObject:@"arm64e"] && [binaryArchitectures containsObject:@"arm64"];

if (!(containsExactArch || arm64eEquivalent)) {
return [[FBIDBError
describeFormat:@"The supported architectures of the target %@ do not intersect with any architectures in the bundle: %@", [FBCollectionInformation oneLineDescriptionFromArray:supportedArchitectures.allObjects], [FBCollectionInformation oneLineDescriptionFromArray:binaryArchitectures.allObjects]]
failBool:error];
}

return YES;
}

Expand Down

0 comments on commit d2e4bfb

Please sign in to comment.