diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-12-30 17:00:31 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2023-12-30 17:20:48 -0800 |
| commit | d9247e7edbbc1da1c333640b185094a5c883bb84 (patch) | |
| tree | d0a9e996e0d2fe2d4dd82ff0dbf93172e2333881 | |
| parent | 68d85c8032bea3d58558dab7b9e8ef5a005637d9 (diff) | |
GitLab CI: Get our clang version from our container
The ubuntu-dev container saves the current clang/llvm version in
`/clang-latest.env`, so use it.
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e22d4a25c..3a1ddb9321 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,8 +22,6 @@ variables: GIT_DEPTH: "1" GIT_FETCH_EXTRA_FLAGS: "--depth=5000" CCACHE_DIR: "${CI_PROJECT_DIR}/ccache" - # Preferred version of clang available on wireshark-ubuntu-dev - CLANG_VERSION: "17" # Enable color output in various tools. # CMake, Ninja, and others: https://bixense.com/clicolors/ CLICOLOR_FORCE: "1" @@ -757,11 +755,9 @@ Fedora MinGW Build: Clang + Code Checks: extends: .build-ubuntu rules: !reference [.if-merge-request] - variables: - CC: "clang-$CLANG_VERSION" - CXX: "clang++-$CLANG_VERSION" needs: [ 'Commit Check' ] script: + - source /clang-latest.env # build-ubuntu puts us in `build`. - cd .. - mkdir cppcheck @@ -948,10 +944,8 @@ Clang Static Analyzer: rules: !reference [.if-daily-schedule] stage: analysis needs: [] - variables: - CC: "clang-${CLANG_VERSION}" - CXX: "clang++-${CLANG_VERSION}" script: + - source /clang-latest.env - scan-build-${CLANG_VERSION} cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=OFF -G Ninja .. - scan-build-${CLANG_VERSION} -o ../sbout ninja - cd ../sbout @@ -1085,12 +1079,11 @@ Code Lines and Data: - wireshark-ubuntu-fuzz resource_group: fuzz-master variables: - CC: "clang-$CLANG_VERSION" - CXX: "clang++-$CLANG_VERSION" INSTALL_PREFIX: "$CI_PROJECT_DIR/_install" MIN_PLUGINS: 10 MAX_PASSES: 15 before_script: + - source /clang-latest.env - DEBIAN_FRONTEND=noninteractive apt-get update # Use DPkg::options::="--force-overwrite" until # https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 |