hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Swift: fix autobuilder bug when Xcode failure breaks the whole autobuild process

Browse Source
This commit is contained in:
Alex Denisov
2023-12-05 09:08:43 +01:00
parent 07b76ee444
commit 8f3d31818c
9 changed files with 361 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
swift/swift-autobuilder/swift-autobuilder.cpp
View File

@@ -44,17 +44,14 @@ static bool isNonSwiftOrTestTarget(const XcodeTarget& t) {
(t.type == unknownType && (endsWith(t.name, "Tests") || endsWith(t.name, "Test")));
}
static void buildSwiftPackages(const std::vector<std::filesystem::path>& swiftPackages,
static bool buildSwiftPackages(const std::vector<std::filesystem::path>& swiftPackages,
bool dryRun) {
auto any_successful =
std::any_of(std::begin(swiftPackages), std::end(swiftPackages), [&](auto& packageFile) {
LOG_INFO("Building Swift package: {}", packageFile);
return buildSwiftPackage(packageFile, dryRun);
});
if (!any_successful) {
codeql::Log::flush();
exit(1);
}
return any_successful;
}
static bool autobuild(const CLIArgs& args) {
@@ -89,11 +86,11 @@ static bool autobuild(const CLIArgs& args) {
auto buildSucceeded = buildXcodeTarget(xcodeTargets.front(), args.dryRun);
// If build failed, try to build Swift packages
if (!buildSucceeded && !swiftPackages.empty()) {
buildSwiftPackages(swiftPackages, args.dryRun);
return buildSwiftPackages(swiftPackages, args.dryRun);
}
return buildSucceeded;
} else if (!swiftPackages.empty()) {
buildSwiftPackages(swiftPackages, args.dryRun);
return buildSwiftPackages(swiftPackages, args.dryRun);
}
return true;
}