diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/mod-ci-github.cxx | 46 | ||||
| -rw-r--r-- | mod/mod-ci-github.hxx | 16 |
2 files changed, 10 insertions, 52 deletions
diff --git a/mod/mod-ci-github.cxx b/mod/mod-ci-github.cxx index 772e0d3..f89ce2c 100644 --- a/mod/mod-ci-github.cxx +++ b/mod/mod-ci-github.cxx @@ -866,11 +866,11 @@ namespace brep build_queued (const tenant_service& ts, const vector<build>& bs, optional<build_state> /* initial_state */, - const fail_mark<server_error>& /* fail */, - const basic_mark& error, - const basic_mark& /* warn */, - const basic_mark& trace) const noexcept + const build_queued_hints&, + const diag_epilogue& log_writer) const noexcept { + NOTIFICATION_DIAG (log_writer); + service_data sd; try { @@ -1017,49 +1017,15 @@ namespace brep function<optional<string> (const brep::tenant_service&)> brep::ci_github:: build_building (const tenant_service&, const build&, - const fail_mark<server_error>&, - const basic_mark&, - const basic_mark&, - const basic_mark&) const noexcept + const diag_epilogue& /* log_writer */) const noexcept { - // return [&b] (const tenant_service& ts) - // { - // string s ("building " + - // b.package_name.string () + '/' + - // b.package_version.string () + '/' + - // b.target.string () + '/' + - // b.target_config_name + '/' + - // b.package_config_name + '/' + - // b.toolchain_name + '/' + - // b.toolchain_version.string ()); - - // return ts.data ? *ts.data + ", " + s : s; - // }; - return nullptr; } function<optional<string> (const brep::tenant_service&)> brep::ci_github:: build_built (const tenant_service&, const build&, - const fail_mark<server_error>&, - const basic_mark&, - const basic_mark&, - const basic_mark&) const noexcept + const diag_epilogue& /* log_writer */) const noexcept { - // return [&b] (const tenant_service& ts) - // { - // string s ("built " + - // b.package_name.string () + '/' + - // b.package_version.string () + '/' + - // b.target.string () + '/' + - // b.target_config_name + '/' + - // b.package_config_name + '/' + - // b.toolchain_name + '/' + - // b.toolchain_version.string ()); - - // return ts.data ? *ts.data + ", " + s : s; - // }; - return nullptr; } diff --git a/mod/mod-ci-github.hxx b/mod/mod-ci-github.hxx index ea221ff..aacd877 100644 --- a/mod/mod-ci-github.hxx +++ b/mod/mod-ci-github.hxx @@ -170,24 +170,16 @@ namespace brep build_queued (const tenant_service&, const vector<build>&, optional<build_state> initial_state, - const fail_mark<server_error>& fail, - const basic_mark& error, - const basic_mark& warn, - const basic_mark& trace) const noexcept override; + const build_queued_hints&, + const diag_epilogue& log_writer) const noexcept override; virtual function<optional<string> (const tenant_service&)> build_building (const tenant_service&, const build&, - const fail_mark<server_error>& fail, - const basic_mark& error, - const basic_mark& warn, - const basic_mark& trace) const noexcept override; + const diag_epilogue& log_writer) const noexcept override; virtual function<optional<string> (const tenant_service&)> build_built (const tenant_service&, const build&, - const fail_mark<server_error>& fail, - const basic_mark& error, - const basic_mark& warn, - const basic_mark& trace) const noexcept override; + const diag_epilogue& log_writer) const noexcept override; private: virtual void |