aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2024-10-31 10:24:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2024-10-31 10:24:03 +0200
commite5b50ebc00573189f258befcd0c6b17b7d78ef8a (patch)
tree802c3bfffd55b1e3d8046d35a92e7e48b74f330b
parent1b27c519ff3ff8a379cbb6e47c3d9094f1a99237 (diff)
Review
-rw-r--r--mod/mod-ci-github-service-data.hxx2
-rw-r--r--mod/mod-ci-github.cxx10
2 files changed, 7 insertions, 5 deletions
diff --git a/mod/mod-ci-github-service-data.hxx b/mod/mod-ci-github-service-data.hxx
index f563e29..5d3cd3b 100644
--- a/mod/mod-ci-github-service-data.hxx
+++ b/mod/mod-ci-github-service-data.hxx
@@ -159,12 +159,12 @@ namespace brep
uint64_t installation_id,
string repository_node_id,
string repository_clone_url,
- string pr_node_id,
kind_type kind,
bool pre_check,
bool re_request,
string check_sha,
string report_sha,
+ string pr_node_id,
uint32_t pr_number);
service_data () = default;
diff --git a/mod/mod-ci-github.cxx b/mod/mod-ci-github.cxx
index fb4b29d..5417f7c 100644
--- a/mod/mod-ci-github.cxx
+++ b/mod/mod-ci-github.cxx
@@ -988,7 +988,7 @@ namespace brep
// Load the tenant, which is essentially the same for both branch push and
// PR. The overall plan is as follows:
//
- // - Create synthetic conclusion check run with the building state. If
+ // - Create synthetic conclusion check run with the in-progress state. If
// unable to, get called again to re-try.
//
// - Load the tenant. If unable to, fail the conclusion check run.
@@ -1072,7 +1072,6 @@ namespace brep
move (br)))
{
assert (cr.state == build_state::built);
-
return cr;
}
else
@@ -1118,7 +1117,9 @@ namespace brep
repository_location rl (move (ru), repository_type::git);
optional<start_result> r (load (error, warn, verb_ ? &trace : nullptr,
- *build_db_, move (ts), move (rl)));
+ *build_db_,
+ move (ts),
+ move (rl)));
if (!r || r->status != 200)
{
@@ -1134,7 +1135,8 @@ namespace brep
// Nothing really we can do in this case since we will not receive
// any further notifications. Log the error as a last resort.
- error << "failed to load CI tenant " << ts.id;
+ error << "failed to load CI tenant " << ts.id
+ << " and unable to update conclusion";
}
return nullptr; // No need to update service data in this case.