diff options
| author | Gerald Combs <gerald@zing.org> | 2021-05-08 09:30:33 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@zing.org> | 2021-05-08 09:30:33 -0700 |
| commit | 28aecbba661551f6c3e1a95abb5ba7955cd67a76 (patch) | |
| tree | 861fe08e7060083f47ff0fdc976676dbf724c017 | |
| parent | 728ae2de5fbb438442ca1359b3be2a10ea3732cf (diff) | |
GitLab CI: Set our Clang version.
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d330a4f49..0158c660ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,7 @@ variables: GIT_DEPTH: "1" GIT_FETCH_EXTRA_FLAGS: "--depth=2000" CCACHE_DIR: "${CI_PROJECT_DIR}/ccache" + CLANG_VERSION: 10 # Common rule stanzas # These must currently be including using "!reference tags". "extends:" and @@ -113,8 +114,8 @@ Clang 10: extends: .build-ubuntu rules: !reference [.if-merged] variables: - CC: clang-10 - CXX: clang++-10 + CC: "clang-$CLANG_VERSION" + CXX: "clang++-$CLANG_VERSION" after_script: - build/run/tshark -G fields > dfilter-list-$( git describe --match "v*" | sed -e 's/^v//' ).txt artifacts: @@ -291,8 +292,8 @@ Code Checks + Clang Warnings: tags: - docker variables: - CC: clang-10 - CXX: clang++-10 + CC: clang-$CLANG_VERSION + CXX: clang++-$CLANG_VERSION script: # build-ubuntu puts us in `build`. - cd .. |