Compare commits

...

2 Commits

2 changed files with 3 additions and 2 deletions

View File

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

View File

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