diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2021-07-16 11:38:58 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2021-07-16 11:50:11 +0200 |
| commit | d694c6d3de22e8a886be2c8ec48fcfbff98e8ed5 (patch) | |
| tree | 9f6ff55d1985581ceddabf6f751eda73d339ae40 /.gitlab-ci.yml | |
| parent | ci/debian-*/Dockerfile: fix build with KNOT_BRANCH=master (diff) | |
| download | knot-resolver-d694c6d3de22e8a886be2c8ec48fcfbff98e8ed5.tar.xz knot-resolver-d694c6d3de22e8a886be2c8ec48fcfbff98e8ed5.zip | |
daemon/lua/kres-gen: support two versions based on Knot
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f04f66b4..dd232b23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,13 +259,18 @@ lint:tidy: script: - ninja -C build_ci* tidy -kres-gen: +.kres-gen: &kres-gen <<: *sanity script: - - meson build_ci_lib --prefix=$PREFIX + - meson build_ci_lib --prefix=$PREFIX -Dkres_gen_test=false - ninja -C build_ci_lib daemon/kresd - ninja -C build_ci_lib kres-gen - git diff --quiet || (git diff; exit 1) +kres-gen-default: + <<: *kres-gen +kres-gen-master: + <<: *kres-gen + image: $CI_REGISTRY/knot/knot-resolver/ci/debian-11:knot-master root.hints: <<: *sanity |