gitlab-ci: speed up the builds a little bit.

Change-Id: I29756429d106b56e5c0b9b61d92f4c6ca8629b36
Reviewed-on: https://code.wireshark.org/review/25923
Reviewed-by: Dario Lombardo <lomato@gmail.com>

1 files changed, 14 insertions, 15 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5bdfb78e3f..789a4b5299 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,90 +7,89 @@ before_script:
   - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" > /etc/apt/sources.list.d/gcc.list
   - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F
   - apt-get update -qq
-  - ./tools/debian-setup.sh --install-optional ninja-build -y
   - mkdir build
   - cd build
 gcc-4:
   retry: 1
   script:
-    - apt-get install gcc-4.9 g++-4.9 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build gcc-4.9 g++-4.9 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 ..
     - ninja
 gcc-5:
   retry: 1
   script:
-    - apt-get install gcc-5 g++-5 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build gcc-5 g++-5 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 ..
     - ninja
 gcc-6:
   retry: 1
   script:
-    - apt-get install 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 ..
     - ninja
 gcc-7:
   retry: 1
   script:
-    - apt-get install 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 ..
     - ninja
 gcc-7-nopcap:
   retry: 1
   script:
-    - apt-get install gcc-7 g++-7 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  gcc-7 g++-7 -y
     - cmake -GNinja -DENABLE_PCAP=OFF -DCMAKE_C_COMPILER=gcc-7 -DCMAKE_CXX_COMPILER=g++-7 ..
     - ninja
 clang-3.5:
   retry: 1
   script:
-    - apt-get install clang-3.5 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  clang-3.5 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-3.5 -DCMAKE_CXX_COMPILER=clang++-3.5 ..
     - ninja
 clang-3.6:
   retry: 1
   script:
-    - apt-get install clang-3.6 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build clang-3.6 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-3.6 -DCMAKE_CXX_COMPILER=clang++-3.6 ..
     - ninja
 clang-3.7:
   retry: 1
   script:
-    - apt-get install clang-3.7 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  clang-3.7 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-3.7 -DCMAKE_CXX_COMPILER=clang++-3.7 ..
     - ninja
 clang-3.8:
   retry: 1
   script:
-    - apt-get install clang-3.8 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  clang-3.8 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-3.8 -DCMAKE_CXX_COMPILER=clang++-3.8 ..
     - ninja
 clang-3.9:
   retry: 1
   script:
-    - apt-get install clang-3.9 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  clang-3.9 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-3.9 -DCMAKE_CXX_COMPILER=clang++-3.9 ..
     - ninja
 clang-4.0:
   retry: 1
   script:
-    - apt-get install clang-4.0 -y
+    - ../tools/debian-setup.sh --install-optional ninja-build  clang-4.0 -y
     - cmake -GNinja -DCMAKE_C_COMPILER=clang-4.0 -DCMAKE_CXX_COMPILER=clang++-4.0 -DCMAKE_C_FLAGS=-Wframe-larger-than=20000 ..
     - ninja
 clang-5.0:
   retry: 1
   script:
-    - apt-get install 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 ..
     - ninja
 clang-6.0:
   retry: 1
   script:
-    - apt-get install 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 ..
     - ninja
 clang-6.0-nopcap:
   retry: 1
   script:
-    - apt install clang-6.0 -y
+    - ../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 ..
     - ninja