]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Extract Clang version to $CLANG_VERSION
authorMichal Nowak <mnowak@isc.org>
Wed, 15 Jun 2022 17:17:38 +0000 (19:17 +0200)
committerMichal Nowak <mnowak@isc.org>
Thu, 16 Jun 2022 15:21:12 +0000 (17:21 +0200)
Extracting Clang version helps with updating Clang version in one place
and not missing one of its instances.

.gitlab-ci.yml

index b2637808179199eb91fd7894d4f30289ca19172b..bdc04efcb1f74e7a8722c3bbfc521216ef473e1b 100644 (file)
@@ -16,10 +16,11 @@ variables:
   TEST_PARALLEL_JOBS: 6
 
   CONFIGURE: ./configure
-  CLANG: clang-14
-  SCAN_BUILD: scan-build-14
-  ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-14/bin/llvm-symbolizer
-  CLANG_FORMAT: clang-format-14
+  CLANG_VERSION: 14
+  CLANG: "clang-${CLANG_VERSION}"
+  SCAN_BUILD: "scan-build-${CLANG_VERSION}"
+  ASAN_SYMBOLIZER_PATH: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer"
+  CLANG_FORMAT: "clang-format-${CLANG_VERSION}"
 
   CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra
 
@@ -1013,7 +1014,7 @@ clang:tsan:
 
 system:clang:tsan:
   variables:
-    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer"
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer"
   <<: *base_image
   <<: *system_test_tsan_job
   needs:
@@ -1022,7 +1023,7 @@ system:clang:tsan:
 
 unit:clang:tsan:
   variables:
-    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-14/bin/llvm-symbolizer suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt"
+    TSAN_OPTIONS: "${TSAN_OPTIONS_COMMON} external_symbolizer_path=/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer suppressions=$CI_PROJECT_DIR/tsan-suppressions.txt"
   <<: *base_image
   <<: *unit_test_tsan_job
   needs: