diff options
| author | Lukáš Ondráček <lukas.ondracek@nic.cz> | 2024-05-07 16:06:23 +0200 |
|---|---|---|
| committer | Lukáš Ondráček <lukas.ondracek@nic.cz> | 2024-05-07 16:06:23 +0200 |
| commit | 3754493f83b41592578417f27483d4ce9c8295bd (patch) | |
| tree | d7698d6c92b2de34188e4034f191a5f746477a75 /.gitlab-ci.yml | |
| parent | fixup! rrl: truncating answers when close to limit, dropping over limit (diff) | |
| parent | Merge remote-tracking branch 'origin/master' into 6.0 (diff) | |
| download | knot-resolver-3754493f83b41592578417f27483d4ce9c8295bd.tar.xz knot-resolver-3754493f83b41592578417f27483d4ce9c8295bd.zip | |
Merge remote-tracking branch 'origin/6.0' into rrl-wip
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbb98269..e8239a97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ archive: build: <<: *build script: - - meson build_ci --default-library=static --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled + - meson build_ci --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled - ninja -C build_ci - ninja -C build_ci install >/dev/null - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake @@ -115,7 +115,7 @@ build-knot32: <<: *build image: $CI_REGISTRY/knot/knot-resolver/ci/debian-11:knot-3.2 script: - - meson build_ci_knot32 --default-library=static --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled + - meson build_ci_knot32 --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled - ninja -C build_ci_knot32 - ninja -C build_ci_knot32 install >/dev/null - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake @@ -123,7 +123,9 @@ build-knot32: build-asan: <<: *build script: - # "undefined" sanitizer causes C++ issues when loading ahocorasick.so in CI + # issues with UBSan and ASan in CI: + # - `ahocorasick.so` causes C++ problems + # - `--default-library=shared` causes link problems - CC=clang CXX=clang++ CFLAGS=-fno-sanitize-recover=all CXXFLAGS=-fno-sanitize=undefined meson build_ci_asan --default-library=static --prefix=$PREFIX -Dmalloc=jemalloc -Db_sanitize=address,undefined -Dextra_tests=enabled - ninja -C build_ci_asan - ninja -C build_ci_asan install >/dev/null @@ -170,7 +172,7 @@ sonarcloud: - tags - master@knot/knot-resolver script: - - meson build_sonarcloud --default-library=static --prefix=$PREFIX -Dmalloc=disabled + - meson build_sonarcloud --prefix=$PREFIX -Dmalloc=disabled - build-wrapper-linux-x86-64 --out-dir bw-output ninja -C build_sonarcloud - > sonar-scanner @@ -549,6 +551,10 @@ obs:trigger: &obs_trigger - condor allow_failure: false # required to make when: manual action blocking script: + - python3 -m venv ./venv + - source ./venv/bin/activate + - pip install --upgrade pip + - pip install apkg - scripts/make-obs.sh - echo y | scripts/build-in-obs.sh $OBS_REPO @@ -750,4 +756,22 @@ pages: paths: - public +# This job pushes the Knot Resolver documentation into a new branch of the +# `websites/knot-resolver.cz` repository. +docs:website: + stage: deploy + needs: + - docs:build + when: manual + variables: + script: + - "SRC_COMMIT_REF=\"$CI_COMMIT_TAG$CI_COMMIT_BRANCH$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME\"" + - "git clone \"https://gitlab-ci-token:$WEBSITE_DOCS_CI_TOKEN@$CI_SERVER_HOST:$CI_SERVER_PORT/websites/knot-resolver.cz.git\" website" + - "cp --recursive --verbose \"doc/html\" \"website/content/documentation/$SRC_COMMIT_REF\"" + - cd website + - "git checkout -b \"docs/$SRC_COMMIT_REF\"" + - "git add \"content/documentation/$SRC_COMMIT_REF\"" + - "git commit -m \"docs: $SRC_COMMIT_REF\"" + - "git push --force --set-upstream origin \"docs/$SRC_COMMIT_REF\"" + # }}} |