diff options
author | Dario Lombardo <lomato@gmail.com> | 2019-05-12 22:33:34 +0200 |
---|---|---|
committer | Peter Wu <peter@lekensteyn.nl> | 2019-05-16 20:29:33 +0000 |
commit | 731b2638534da3f2299c1c90bc23e99112453172 (patch) | |
tree | 55572490a067714c16a48ec70b4987d3e64abec7 /.gitlab-ci.yml | |
parent | 3161feb02629e243509c889e9a25c095605cb13f (diff) |
gitlab-ci: move ubuntu commands in parent job.
Change-Id: Ieb7a05c74b728d3d293790d28812c9161bfa6ce3
Reviewed-on: https://code.wireshark.org/review/33181
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 94 |
1 files changed, 40 insertions, 54 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02821ca0ef..e7c8c4924e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,84 +21,70 @@ - export PYTEST_ADDOPTS=--skip-missing-programs=dumpcap,rawshark - mkdir build - cd build + script: + - cmake -GNinja $CMAKE_ARGS .. + - ninja + - ninja test-programs + - chown -R user . + - su user -c pytest-3 + .build-rpm: &build-rpm <<: *build artifacts: paths: - build/packaging/rpm/RPMS expire_in: 3 days + gcc-5: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CC: gcc-5 + CXX: g++-5 gcc-6: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=gcc-6 -DCMAKE_CXX_COMPILER=g++-6 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CC: gcc-6 + CXX: g++-6 gcc-7: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CC: gcc-7 + CXX: g++-7 gcc-8: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CC: gcc-8 + CXX: g++-8 gcc-8-nopcap: <<: *build-ubuntu - script: - - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CMAKE_ARGS: -DENABLE_PCAP=NO + CC: gcc-8 + CXX: g++-8 clang-5: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=clang-5.0 -DCMAKE_CXX_COMPILER=clang++-5.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CMAKE_ARGS: -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 + CC: clang-5.0 + CXX: clang++-5.0 clang-6: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=clang-6.0 -DCMAKE_CXX_COMPILER=clang++-6.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CMAKE_ARGS: -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 + CC: clang-6.0 + CXX: clang++-6.0 clang-7: <<: *build-ubuntu - script: - - cmake -GNinja -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CMAKE_ARGS: -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 + CC: clang-7 + CXX: clang++-7 clang-7-nopcap: <<: *build-ubuntu - script: - - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=clang-7 -DCMAKE_CXX_COMPILER=clang++-7 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 .. - - ninja - - ninja test-programs - - chown -R user . - - su user -c pytest-3 + variables: + CMAKE_ARGS: -DENABLE_PCAP=NO -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 + CC: clang-7 + CXX: clang++-7 build:rpm-centos-7: <<: *build-rpm image: centos:7 |