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

Merge pull request #15305 from github/alexdenisov/revert-swift-change

Browse Source 
Revert "Swift: separate installation of dependencies and autobuilding"
This commit is contained in:
Alexander Eyers-Taylor
2024-01-12 13:55:54 +00:00
committed by GitHub
parent b209ea6735 28dd2e979b
commit b2f1fbe875
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,11 +54,6 @@ static bool buildSwiftPackages(const std::vector<std::filesystem::path>& swiftPa
return any_successful;
}
static void installDependencies(const CLIArgs& args) {
auto structure = scanProjectStructure(args.workingDir);
installDependencies(structure, args.dryRun);
}
static bool autobuild(const CLIArgs& args) {
auto structure = scanProjectStructure(args.workingDir);
auto& xcodeTargets = structure.xcodeTargets;
@@ -87,6 +82,7 @@ static bool autobuild(const CLIArgs& args) {
return false;
} else if (!xcodeTargets.empty()) {
LOG_INFO("Building Xcode target: {}", xcodeTargets.front());
installDependencies(structure, args.dryRun);
auto buildSucceeded = buildXcodeTarget(xcodeTargets.front(), args.dryRun);
// If build failed, try to build Swift packages
if (!buildSucceeded && !swiftPackages.empty()) {
@@ -117,7 +113,6 @@ static CLIArgs parseCLIArgs(int argc, char** argv) {
int main(int argc, char** argv) {
auto args = parseCLIArgs(argc, argv);
installDependencies(args);
auto success = autobuild(args);
codeql::Log::flush();
if (!success) {