diff options
| author | Dario Lombardo <lomato@gmail.com> | 2018-02-26 16:27:57 -0500 |
|---|---|---|
| committer | Dario Lombardo <lomato@gmail.com> | 2018-03-01 13:04:09 +0000 |
| commit | cca89ca8375328981c0d8373974e8891c01092e0 (patch) | |
| tree | c78c91ac2699cf444e7b476a85581bd9dbbf4084 | |
| parent | 9e02ae10d51cb6e5c8d6fd8be62f119ee0a00b59 (diff) | |
gitlab-ci: add clang 7 builds.
Compile nopcap with clang 7 instead of 6.
Change-Id: Icc3ffc895e2b97feadca719b45ef72a5d79098cd
Reviewed-on: https://code.wireshark.org/review/26207
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
| -rw-r--r-- | .gitlab-ci.yml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 789a4b5299..7a85fc124a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ image: crondaemon/wireshark before_script: - rm -rf /etc/apt/sources.list.d/* + - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial main" > /etc/apt/sources.list.d/clang.list - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main" > /etc/apt/sources.list.d/clang5.list - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" > /etc/apt/sources.list.d/clang6.list - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421 @@ -87,9 +88,15 @@ clang-6.0: - ../tools/debian-setup.sh --install-optional ninja-build clang-6.0 -y - cmake -GNinja -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - ninja -clang-6.0-nopcap: +clang-7: retry: 1 script: - - ../tools/debian-setup.sh --install-optional ninja-build clang-6.0 -y - - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. + - ../tools/debian-setup.sh --install-optional ninja-build clang-7 -y + - cmake -GNinja -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. + - ninja +clang-7-nopcap: + retry: 1 + script: + - ../tools/debian-setup.sh --install-optional ninja-build clang-7 -y + - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - ninja |