vriska/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Merge remote-tracking branch 'origin/master' into flake

Browse source
This commit is contained in:
Eelco Dolstra 2020-02-03 17:49:01 +01:00
parent e7f2139e25 9da60e3c66
commit bb94677526
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hydra-evaluator/hydra-evaluator.cc
View file

@ -6,7 +6,7 @@
#include <algorithm> #include <algorithm>
#include <thread> #include <thread>
#include <cstring> #include <cstring>
#include <experimental/optional> #include <optional>
#include <sys/types.h> #include <sys/types.h>
#include <sys/wait.h> #include <sys/wait.h>
@ -31,7 +31,7 @@ struct Evaluator
typedef std::map<JobsetName, Jobset> Jobsets; typedef std::map<JobsetName, Jobset> Jobsets;
std::experimental::optional<JobsetName> evalOne; std::optional<JobsetName> evalOne;
const size_t maxEvals; const size_t maxEvals;

1
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -23,6 +23,7 @@ namespace nix {
template<> void toJSON<std::atomic<long>>(std::ostream & str, const std::atomic<long> & n) { str << n; } template<> void toJSON<std::atomic<long>>(std::ostream & str, const std::atomic<long> & n) { str << n; }
template<> void toJSON<std::atomic<unsigned long>>(std::ostream & str, const std::atomic<unsigned long> & n) { str << n; } template<> void toJSON<std::atomic<unsigned long>>(std::ostream & str, const std::atomic<unsigned long> & n) { str << n; }
template<> void toJSON<std::atomic<unsigned long long>>(std::ostream & str, const std::atomic<unsigned long long> & n) { str << n; }
template<> void toJSON<double>(std::ostream & str, const double & n) { str << n; } template<> void toJSON<double>(std::ostream & str, const double & n) { str << n; }
} }

6
src/libhydra/db.hh
View file

@ -23,7 +23,7 @@ struct Connection : pqxx::connection
class receiver : public pqxx::notification_receiver class receiver : public pqxx::notification_receiver
{ {
std::experimental::optional<std::string> status; std::optional<std::string> status;
public: public:
@ -35,9 +35,9 @@ public:
status = payload; status = payload;
}; };
std::experimental::optional<std::string> get() { std::optional<std::string> get() {
auto s = status; auto s = status;
status = std::experimental::nullopt; status = std::nullopt;
return s; return s;
} }
}; };

2
src/root/build.tt
View file

@ -292,11 +292,9 @@ END;
<th>Last successful build [% INCLUDE renderDateTime timestamp = prevSuccessfulBuild.timestamp %]</th> <th>Last successful build [% INCLUDE renderDateTime timestamp = prevSuccessfulBuild.timestamp %]</th>
[% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %] [% IF prevSuccessfulBuild && firstBrokenBuild && firstBrokenBuild.id != build.id %]
<th>First broken build [% INCLUDE renderDateTime timestamp = firstBrokenBuild.timestamp %] <th>First broken build [% INCLUDE renderDateTime timestamp = firstBrokenBuild.timestamp %]
<a class="btn btn-mini" href="[% c.uri_for(c.controller('API').action_for('logdiff') prevSuccessfulBuild.id firstBrokenBuild.id ) %]">log diff</a>
</th> </th>
[% END %] [% END %]
<th>This build [% INCLUDE renderDateTime timestamp = build.timestamp %] <th>This build [% INCLUDE renderDateTime timestamp = build.timestamp %]
<a class="btn btn-mini" href="[% c.uri_for(c.controller('API').action_for('logdiff') prevSuccessfulBuild.id build.id) %]">log diff</a>
</th> </th>
</thead> </thead>
<tr> <tr>