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

Swift: separate installation of dependencies and autobuilding

Browse Source 
`pod install` could generate Xcode projects files needed for
autobuilding, so it's better to install dependencies first, and then do
re-scan to pick up the new files.
This commit is contained in:
Alex Denisov
2023-12-15 10:25:23 +01:00
parent 1ea1130271
commit dd13ea3d0a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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