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

Merge pull request 'chore: apply lix include-rearrangement to hydra' (#14) from jade/include-rearrangement into main

Browse source 
Reviewed-on: lix-project/hydra#14
Reviewed-by: leo60228 <leo@60228.dev>
This commit is contained in:
leo60228 2024-11-29 16:23:14 -05:00
commit 6285440304
Signed by untrusted user: vriska
GPG key ID: 6F3EB461799AD95E
12 changed files with 51 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,9 +1,9 @@
#include "db.hh"
#include "hydra-config.hh"
#include "logging.hh"
#include "pool.hh"
#include "shared.hh"
#include "signals.hh"
#include "lix/libmain/shared.hh"
#include "lix/libutil/logging.hh"
#include "lix/libutil/pool.hh"
#include "lix/libutil/signals.hh"
#include <algorithm>
#include <thread>

19
src/hydra-queue-runner/build-remote.cc
View file

@ -6,18 +6,17 @@
#include <sys/stat.h>
#include <fcntl.h>
#include "build-result.hh"
#include "current-process.hh"
#include "path.hh"
#include "serve-protocol.hh"
#include "lix/libstore/build-result.hh"
#include "lix/libstore/path.hh"
#include "lix/libstore/serve-protocol-impl.hh"
#include "lix/libstore/serve-protocol.hh"
#include "lix/libstore/ssh.hh"
#include "lix/libutil/current-process.hh"
#include "lix/libutil/finally.hh"
#include "lix/libutil/url.hh"
#include "state.hh"
#include "serve-protocol.hh"
#include "serve-protocol-impl.hh"
#include "ssh.hh"
#include "finally.hh"
#include "url.hh"
#include "temporary-dir.hh"
#include "lix/libstore/temporary-dir.hh"
using namespace nix;

6
src/hydra-queue-runner/build-result.cc
View file

@ -1,7 +1,7 @@
#include "hydra-build-result.hh"
#include "store-api.hh"
#include "fs-accessor.hh"
#include "strings.hh"
#include "lix/libstore/fs-accessor.hh"
#include "lix/libstore/store-api.hh"
#include "lix/libutil/strings.hh"
#include <regex>

8
src/hydra-queue-runner/builder.cc
View file

@ -1,10 +1,10 @@
#include <cmath>
#include "error.hh"
#include "state.hh"
#include "hydra-build-result.hh"
#include "finally.hh"
#include "binary-cache-store.hh"
#include "lix/libstore/binary-cache-store.hh"
#include "lix/libutil/error.hh"
#include "lix/libutil/finally.hh"
#include "state.hh"
using namespace nix;

6
src/hydra-queue-runner/hydra-build-result.hh
View file

@ -2,9 +2,9 @@
#include <memory>
#include "hash.hh"
#include "derivations.hh"
#include "store-api.hh"
#include "lix/libstore/derivations.hh"
#include "lix/libstore/store-api.hh"
#include "lix/libutil/hash.hh"
#include "nar-extractor.hh"
struct BuildProduct

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

@ -11,16 +11,16 @@
#include <nlohmann/json.hpp>
#include "signals.hh"
#include "state.hh"
#include "hydra-build-result.hh"
#include "store-api.hh"
#include "lix/libstore/store-api.hh"
#include "lix/libutil/signals.hh"
#include "state.hh"
#include "args.hh"
#include "globals.hh"
#include "hydra-config.hh"
#include "s3-binary-cache-store.hh"
#include "shared.hh"
#include "lix/libmain/shared.hh"
#include "lix/libstore/globals.hh"
#include "lix/libstore/s3-binary-cache-store.hh"
#include "lix/libutil/args.hh"
using namespace nix;
using nlohmann::json;

2
src/hydra-queue-runner/nar-extractor.cc
View file

@ -1,6 +1,6 @@
#include "nar-extractor.hh"
#include "archive.hh"
#include "lix/libutil/archive.hh"
#include <unordered_set>
#include <utility>

8
src/hydra-queue-runner/nar-extractor.hh
View file

@ -1,9 +1,9 @@
#pragma once
#include "fs-accessor.hh"
#include "types.hh"
#include "serialise.hh"
#include "hash.hh"
#include "lix/libstore/fs-accessor.hh"
#include "lix/libutil/hash.hh"
#include "lix/libutil/serialise.hh"
#include "lix/libutil/types.hh"
struct NarMemberData
{

6
src/hydra-queue-runner/queue-monitor.cc
View file

@ -1,7 +1,7 @@
#include "state.hh"
#include "hydra-build-result.hh"
#include "globals.hh"
#include "thread-pool.hh"
#include "lix/libstore/globals.hh"
#include "lix/libutil/thread-pool.hh"
#include "state.hh"
#include <cstring>
#include <utility>

16
src/hydra-queue-runner/state.hh
View file

@ -16,15 +16,15 @@
#include "db.hh"
#include "parsed-derivations.hh"
#include "pathlocks.hh"
#include "pool.hh"
#include "build-result.hh"
#include "store-api.hh"
#include "sync.hh"
#include "lix/libstore/build-result.hh"
#include "lix/libstore/machines.hh"
#include "lix/libstore/parsed-derivations.hh"
#include "lix/libstore/pathlocks.hh"
#include "lix/libstore/serve-protocol.hh"
#include "lix/libstore/store-api.hh"
#include "lix/libutil/pool.hh"
#include "lix/libutil/sync.hh"
#include "nar-extractor.hh"
#include "serve-protocol.hh"
#include "machines.hh"
using BuildID = unsigned int;

4
src/libhydra/db.hh
View file

@ -2,8 +2,8 @@
#include <pqxx/pqxx>
#include "strings.hh"
#include "environment-variables.hh"
#include "lix/libutil/environment-variables.hh"
#include "lix/libutil/strings.hh"
struct Connection : pqxx::connection

6
src/libhydra/hydra-config.hh
View file

@ -2,9 +2,9 @@
#include <map>
#include "environment-variables.hh"
#include "file-system.hh"
#include "strings.hh"
#include "lix/libutil/environment-variables.hh"
#include "lix/libutil/file-system.hh"
#include "lix/libutil/strings.hh"
struct HydraConfig
{