osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

gitlab-ci: rename tasks and remove extra spaces. 

Change-Id: If047e5f05e56ba3b0e5425f0827882434a53c925
Reviewed-on: https://code.wireshark.org/review/29333
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2018-08-29 12:18:57 +02:00 committed by Anders Broman
parent 43f0ccadaf
commit 708c1ae794
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -3,7 +3,7 @@
retry: 1 retry: 1
before_script: before_script:
- rm -rf /etc/apt/sources.list.d/* - 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 main" > /etc/apt/sources.list.d/clang.list
- echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" > /etc/apt/sources.list.d/clang6.list - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" > /etc/apt/sources.list.d/clang6.list
- echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" > /etc/apt/sources.list.d/clang7.list - echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main" > /etc/apt/sources.list.d/clang7.list
- apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421 - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 15CF4D18AF4F7421
@ -27,44 +27,44 @@ gcc-5:
gcc-6: gcc-6:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build gcc-6 g++-6 -y - ../tools/debian-setup.sh --install-optional ninja-build gcc-6 g++-6 -y
- cmake -GNinja -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 .. - cmake -GNinja -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 ..
- ninja - ninja
gcc-7: gcc-7:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build gcc-7 g++-7 -y - ../tools/debian-setup.sh --install-optional ninja-build gcc-7 g++-7 -y
- cmake -GNinja -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 .. - cmake -GNinja -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 ..
- ninja - ninja
gcc-8: gcc-8:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build gcc-8 g++-8 -y - ../tools/debian-setup.sh --install-optional ninja-build gcc-8 g++-8 -y
- cmake -GNinja -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 .. - cmake -GNinja -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ..
- ninja - ninja
gcc-8-nopcap: gcc-8-nopcap:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build gcc-8 g++-8 -y - ../tools/debian-setup.sh --install-optional ninja-build gcc-8 g++-8 -y
- cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 .. - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 ..
- ninja - ninja
clang-5.0: clang-5:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build clang-5.0 -y - ../tools/debian-setup.sh --install-optional ninja-build clang-5.0 -y
- cmake -GNinja -DCMAKE_C_COMPILER=clang-5.0 -DCMAKE_CXX_COMPILER=clang++-5.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - cmake -GNinja -DCMAKE_C_COMPILER=clang-5.0 -DCMAKE_CXX_COMPILER=clang++-5.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 ..
- ninja - ninja
clang-6.0: clang-6:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build clang-6.0 -y - ../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 .. - cmake -GNinja -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 ..
- ninja - ninja
clang-7: clang-7:
<<: *ubuntu <<: *ubuntu
script: script:
- ../tools/debian-setup.sh --install-optional ninja-build clang-7 -y - ../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 .. - cmake -GNinja -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 ..
- ninja - ninja
clang-7-nopcap: clang-7-nopcap:
<<: *ubuntu <<: *ubuntu