Lubuntu/ci-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Lubuntu:2aa28e2a5068da9f034084fb880360e60bc29e7d
Branches Tags
Lubuntu:main
...
compare: Lubuntu:f08b3ee199717481d84be6cb03c1646914647ff0
Branches Tags
Lubuntu:main

2 Commits
2aa28e2a50 ... f08b3ee199

Author SHA1 Message Date
Simon Quigley
f08b3ee199 Fix compilation warning 2025-02-04 00:57:19 -06:00
Simon Quigley
61f017eb2a Only copy the debian directory, to avoid diff errors when the packaging tracks upstream sources 2025-02-04 00:55:16 -06:00
2 changed files with 5 additions and 3 deletions
Show Stats Expand all files Collapse all files

7
cpp/ci_logic.cpp
View File

@ -391,10 +391,11 @@ std::tuple<bool, std::set<std::string>> CiLogic::build_project(std::shared_ptr<P
update_changelog(packaging_dir, proj->release->codename, proj->upstream_version, std::to_string(proj->ppa_revision), log); update_changelog(packaging_dir, proj->release->codename, proj->upstream_version, std::to_string(proj->ppa_revision), log);
log->append("Changelog updated, copying the packaging..."); log->append("Changelog updated, copying the packaging...");
// Now copy entire packaging into a subfolder // Now copy only the "debian" directory from packaging into a subfolder
fs::path dest_dir = working_dir / (proj->package->name + "-" + proj->upstream_version); fs::path dest_dir = working_dir / (proj->package->name + "-" + proj->upstream_version);
copy_directory(packaging_dir, dest_dir); fs::create_directories(dest_dir);
log->append("Copied packaging to " + dest_dir.string() + ", copying tarball..."); copy_directory(packaging_dir / "debian", dest_dir / "debian");
log->append(std::format("Copied {}/debian => {}/debian", packaging_dir.string(), dest_dir.string()));
// Reset changelog after dch (so local changes aren't committed) // Reset changelog after dch (so local changes aren't committed)
reset_changelog(packaging_dir.parent_path() / proj->package->name, changelog); reset_changelog(packaging_dir.parent_path() / proj->package->name, changelog);

1
cpp/db_common.cpp
View File

@ -85,6 +85,7 @@ QSqlDatabase get_thread_connection() {
} }
return thread_db; return thread_db;
} }
return QSqlDatabase();
} }
bool ci_query_exec(QSqlQuery* query, const QString query_string) { bool ci_query_exec(QSqlQuery* query, const QString query_string) {