summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorOto Šťáva <oto.stava@nic.cz>2024-05-31 15:04:25 +0200
committerOto Šťáva <oto.stava@nic.cz>2024-06-04 16:00:34 +0200
commit68688fac013a4c16a476acc15c366a8ce07ed46e (patch)
tree9f539db33aea646a7c0c5d125578f3d1a38b1797 /.gitlab-ci.yml
parentdaemon/session2: fix asynchronous layer iterations (diff)
downloadknot-resolver-68688fac013a4c16a476acc15c366a8ce07ed46e.tar.xz
knot-resolver-68688fac013a4c16a476acc15c366a8ce07ed46e.zip
.gitlab-ci: use Arch for linting
This allows us to use the newest versions of linter tools.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml19
1 files changed, 17 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e83ecb78..7b638133 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ variables:
# IMAGE_TAG is a Git branch/tag name from https://gitlab.nic.cz/knot/knot-resolver-ci
# In general, keep it pointing to a tag - use a branch only for development.
# More info in the knot-resolver-ci repository.
- IMAGE_TAG: 'v20240506'
+ IMAGE_TAG: 'v20240604'
IMAGE_PREFIX: '$CI_REGISTRY/knot/knot-resolver-ci'
image: $IMAGE_PREFIX/debian12-knot_3_3:$IMAGE_TAG
@@ -84,6 +84,12 @@ stages:
reports:
junit: build_ci*/meson-logs/integration.deckard.junit.xml
+.after_build_arch: &after_build_arch
+ <<: *after_build
+ image: $IMAGE_PREFIX/arch:$IMAGE_TAG
+ needs:
+ - build-arch
+
.nodep: &nodep
<<: *common
needs: []
@@ -112,6 +118,15 @@ archive:
script:
- apkg make-archive
+build-arch:
+ <<: *build
+ image: $IMAGE_PREFIX/arch:$IMAGE_TAG
+ script:
+ - meson build_ci_arch --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true
+ - ninja -C build_ci_arch
+ - ninja -C build_ci_arch install >/dev/null
+ - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
+
build-stable:
<<: *build
script:
@@ -264,7 +279,7 @@ lint:pedantic:
- ninja -C build_pedantic_clang
lint:tidy:
- <<: *after_build
+ <<: *after_build_arch
stage: sanity
script:
- ninja -C build_ci* tidy