[vcpkg-ci] Delete intermediate build folders even on unsuccesful builds
MODIFY
src/vcpkg/build.cpp
src/vcpkg/build.cpp
@@ -258,7 +258,7 @@ namespace vcpkg::Build
paths.get_filesystem().write_contents(binary_control_file, start);
}
- ExtendedBuildResult build_package(const VcpkgPaths& paths,
+ static ExtendedBuildResult do_build_package(const VcpkgPaths& paths,
const BuildPackageConfig& config,
const StatusParagraphs& status_db)
{
@@ -369,10 +369,19 @@ namespace vcpkg::Build
write_binary_control_file(paths, *bcf);
+ return {BuildResult::SUCCEEDED, std::move(bcf)};
+ }
+
+ ExtendedBuildResult build_package(const VcpkgPaths& paths,
+ const BuildPackageConfig& config,
+ const StatusParagraphs& status_db)
+ {
+ ExtendedBuildResult result = do_build_package(paths, config, status_db);
+
if (config.build_package_options.clean_buildtrees == CleanBuildtrees::YES)
{
auto& fs = paths.get_filesystem();
- auto buildtrees_dir = paths.buildtrees / spec.name();
+ auto buildtrees_dir = paths.buildtrees / config.scf.core_paragraph->name;
auto buildtree_files = fs.get_files_non_recursive(buildtrees_dir);
for (auto&& file : buildtree_files)
{
@@ -384,7 +393,7 @@ namespace vcpkg::Build
}
}
- return {BuildResult::SUCCEEDED, std::move(bcf)};
+ return result;
}
const std::string& to_string(const BuildResult build_result)

[vcpkg-ci] Delete intermediate build folders even on unsuccesful builds