]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
gitlabci: use variable for Knot DNS version
authorTomas Krizek <tomas.krizek@nic.cz>
Fri, 18 Jan 2019 14:00:40 +0000 (15:00 +0100)
committerTomas Krizek <tomas.krizek@nic.cz>
Wed, 23 Jan 2019 13:58:45 +0000 (14:58 +0100)
.gitlab-ci.yml

index ae4ac0b0a78d75353043b3cf497c838ae8077acf..c715aa34998d2277d99904d23f4d7b1d4eebdefd 100644 (file)
@@ -1,5 +1,3 @@
-image: $CI_REGISTRY/knot/knot-resolver/ci/debian-stable:knot-2.7
-
 variables:
   DEBIAN_FRONTEND: noninteractive
   LC_ALL: C.UTF-8
@@ -11,6 +9,9 @@ variables:
   RESPDIFF_COUNT: 1
   RESPDIFF_FORCE: 0
   RESPERF_FORCE: 0
+  KNOT_VERSION: 2.7
+
+image: $CI_REGISTRY/knot/knot-resolver/ci/debian-stable:knot-$KNOT_VERSION
 
 stages:
   - build
@@ -52,7 +53,7 @@ lint:pedantic:
   dependencies: []  # do not download build artifacts
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer compilers
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer compilers
   variables:
     CFLAGS: -Werror -Wall -Wpedantic -ggdb -std=gnu11
   script:
@@ -97,7 +98,7 @@ lint:c:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer Clang
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - make lint-c CLANG_TIDY="clang-tidy -quiet"
@@ -108,7 +109,7 @@ lint:clang-scan-build:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer Clang
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - MAKEFLAGS="-k -j$(nproc)" SCAN_BUILD="scan-build -o scan-results --status-bugs -no-failure-reports" ./tests/clang_scan_build.sh make || true