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

Compare commits

base: Lubuntu:94f5e376d4c6c0711010cf155fe480b5dba83cb3
Branches Tags
Lubuntu:main
...
compare: Lubuntu:fca016b1dfe54e38c776863618ccf66b056c9a76
Branches Tags
Lubuntu:main

2 Commits
94f5e376d4 ... fca016b1df

Author SHA1 Message Date
Simon Quigley
fca016b1df Explicitly pass pkgconf to the lambda for source checks 2025-01-28 14:47:41 -06:00
Simon Quigley
9636a83546 Explicitly sync packageconfs after build/upload 2025-01-28 14:46:42 -06:00
2 changed files with 3 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
cpp/ci_logic.cpp
View File

@ -735,12 +735,14 @@ std::string CiLogic::queue_build_upload(std::vector<std::shared_ptr<PackageConf>
job_statuses->at("source_build"), job_statuses->at("source_build"),
[this, r, &task_queue, job_statuses](std::shared_ptr<Log> log) mutable { [this, r, &task_queue, job_statuses](std::shared_ptr<Log> log) mutable {
auto [build_ok, changes_files] = build_project(r, log); auto [build_ok, changes_files] = build_project(r, log);
r->sync();
if (build_ok) { if (build_ok) {
task_queue->enqueue( task_queue->enqueue(
job_statuses->at("upload"), job_statuses->at("upload"),
[this, r, changes_files](std::shared_ptr<Log> log) mutable { [this, r, changes_files](std::shared_ptr<Log> log) mutable {
bool upload_ok = upload_and_lint(r, changes_files, false, log); bool upload_ok = upload_and_lint(r, changes_files, false, log);
(void)upload_ok; (void)upload_ok;
r->sync();
}, },
r r
); );

3
cpp/web_server.cpp
View File

@ -222,8 +222,7 @@ bool WebServer::start_server(quint16 port) {
task_queue->enqueue( task_queue->enqueue(
job_statuses->at("source_check"), job_statuses->at("source_check"),
[this, proposed](std::shared_ptr<Log> log) mutable { [this, pkgconf, proposed](std::shared_ptr<Log> log) mutable {
std::shared_ptr<PackageConf> pkgconf = log->get_task_context()->get_parent_packageconf();
std::string package_version = pkgconf->upstream_version + "-0ubuntu0~ppa" + std::to_string(pkgconf->ppa_revision); std::string package_version = pkgconf->upstream_version + "-0ubuntu0~ppa" + std::to_string(pkgconf->ppa_revision);
bool found_in_ppa = false; bool found_in_ppa = false;
for (auto spph : proposed.getPublishedSources("", "", std::nullopt, true, true, "", pkgconf->package->name, "", package_version)) { for (auto spph : proposed.getPublishedSources("", "", std::nullopt, true, true, "", pkgconf->package->name, "", package_version)) {