diff options
| -rw-r--r-- | mod/mod-ci-github-service-data.hxx | 2 | ||||
| -rw-r--r-- | mod/mod-ci-github.cxx | 10 |
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. |