-
-
Notifications
You must be signed in to change notification settings - Fork 304
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
There are some known regressions regarding local testing setups - since everything was kinda half written with the expectation that build dir = source dir (which should not be true anymore). But everything builds and the test suite runs fine, after several hours spent debugging random crashes in libpqxx with MALLOC_PERTURB_... (cherry picked from commit 4b886d9)
- Loading branch information
1 parent
d0cfbed
commit 078d782
Showing
26 changed files
with
207 additions
and
322 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,7 @@ | ||
/.pls_cache | ||
*.o | ||
*~ | ||
Makefile | ||
Makefile.in | ||
.deps | ||
.hydra-data | ||
/config.guess | ||
/config.log | ||
/config.status | ||
/config.sub | ||
/configure | ||
/depcomp | ||
/libtool | ||
/ltmain.sh | ||
/autom4te.cache | ||
/aclocal.m4 | ||
/missing | ||
/install-sh | ||
.test_info.* | ||
/src/sql/hydra-postgresql.sql | ||
/src/sql/hydra-sqlite.sql | ||
/src/sql/tmp.sqlite | ||
/src/root/static/bootstrap | ||
/src/root/static/js/flot | ||
/tests | ||
/doc/manual/images | ||
/doc/manual/manual.html | ||
/doc/manual/manual.pdf | ||
/t/.bzr* | ||
/t/.git* | ||
/t/.hg* | ||
/t/nix | ||
/t/data | ||
/t/jobs/config.nix | ||
t/jobs/declarative/project.json | ||
/inst | ||
hydra-config.h | ||
hydra-config.h.in | ||
result | ||
result-* | ||
outputs | ||
config | ||
stamp-h1 | ||
src/hydra-evaluator/hydra-evaluator | ||
src/hydra-queue-runner/hydra-queue-runner | ||
src/root/static/fontawesome/ | ||
src/root/static/bootstrap*/ |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
srcs = files( | ||
'src/SUMMARY.md', | ||
'src/about.md', | ||
'src/api.md', | ||
'src/configuration.md', | ||
'src/hacking.md', | ||
'src/installation.md', | ||
'src/introduction.md', | ||
'src/jobs.md', | ||
'src/monitoring/README.md', | ||
'src/notifications.md', | ||
'src/plugins/README.md', | ||
'src/plugins/RunCommand.md', | ||
'src/plugins/declarative-projects.md', | ||
'src/projects.md', | ||
'src/webhooks.md', | ||
) | ||
|
||
manual = custom_target( | ||
'manual', | ||
command: [ | ||
mdbook, 'build', '@SOURCE_ROOT@/doc/manual', '-d', meson.current_build_dir() / 'html' | ||
], | ||
depend_files: srcs, | ||
output: ['html'], | ||
build_by_default: true, | ||
) | ||
|
||
install_subdir( | ||
manual.full_path(), | ||
install_dir: get_option('datadir') / 'doc/hydra', | ||
strip_directory: true, | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
project('hydra', 'cpp', | ||
version: files('version.txt'), | ||
license: 'GPL-3.0', | ||
default_options: [ | ||
'debug=true', | ||
'optimization=2', | ||
'cpp_std=c++20', | ||
], | ||
) | ||
|
||
nix_expr_dep = dependency('nix-expr', required: true) | ||
nix_main_dep = dependency('nix-main', required: true) | ||
nix_store_dep = dependency('nix-store', required: true) | ||
|
||
# Lix/Nix need extra flags not provided in its pkg-config files. | ||
nix_dep = declare_dependency( | ||
dependencies: [ | ||
nix_expr_dep, | ||
nix_main_dep, | ||
nix_store_dep, | ||
], | ||
compile_args: ['-include', 'nix/config.h'], | ||
) | ||
|
||
pqxx_dep = dependency('libpqxx', required: true) | ||
|
||
prom_cpp_core_dep = dependency('prometheus-cpp-core', required: true) | ||
prom_cpp_pull_dep = dependency('prometheus-cpp-pull', required: true) | ||
|
||
mdbook = find_program('mdbook', native: true) | ||
perl = find_program('perl', native: true) | ||
|
||
subdir('doc/manual') | ||
subdir('nixos-modules') | ||
subdir('src') | ||
subdir('t') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
install_data('hydra.nix', | ||
install_dir: get_option('datadir') / 'nix', | ||
rename: ['hydra-module.nix'], | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
hydra_evaluator = executable('hydra-evaluator', | ||
'hydra-evaluator.cc', | ||
dependencies: [ | ||
libhydra_dep, | ||
nix_dep, | ||
pqxx_dep, | ||
], | ||
install: true, | ||
) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
srcs = files( | ||
'builder.cc', | ||
'build-remote.cc', | ||
'build-result.cc', | ||
'dispatcher.cc', | ||
'hydra-queue-runner.cc', | ||
'nar-extractor.cc', | ||
'queue-monitor.cc', | ||
) | ||
|
||
hydra_queue_runner = executable('hydra-queue-runner', | ||
'hydra-queue-runner.cc', | ||
srcs, | ||
dependencies: [ | ||
libhydra_dep, | ||
nix_dep, | ||
pqxx_dep, | ||
prom_cpp_core_dep, | ||
prom_cpp_pull_dep, | ||
], | ||
install: true, | ||
) |
Oops, something went wrong.