8000 Revert "Swift: separate installation of dependencies and autobuilding" by AlexDenisov · Pull Request #15305 · github/codeql · GitHub
[go: up one dir, main page]
Skip to content

Revert "Swift: separate installation of dependencies and autobuilding" #15305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Revert "Swift: separate installation of dependencies and autobuilding" #15305

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Revert "Swift: separate installation of dependencies and autobuilding" 
This reverts commit dd13ea3.
  • Loading branch information
@AlexDenisov
AlexDenisov committed Jan 12, 2024
commit 28dd2e979b73feed485f644df0e13a6f767170e7
7 changes: 1 addition & 6 deletions swift/swift-autobuilder/swift-autobuilder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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) {
Expand Down
0