Changing build matrix on Travis.

atmoswing · Jan 12, 2018 · 1521b38 · 1521b38
1 parent 8f8775d
commit 1521b38
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,22 +2,35 @@ language: cpp
 compiler: gcc
 dist: trusty
 sudo: required
-addons:
-  apt:
-    packages:
-      - build-essential
-      - gnome-devel
-      - cmake
-      - git
-      - libnetcdf-dev
-      - libproj-dev
-      - libjasper-dev
-      - libcurl3
-      - libwxgtk3.0-dev
 matrix:
   include:
-    - env: TARGET=tests
-    - env: TARGET=coverage
+    - env: TARGET=server-version
+      addons:
+        apt:
+          packages:
+            - build-essential
+            - gnome-devel
+            - cmake
+            - git
+            - libnetcdf-dev
+            - libproj-dev
+            - libjasper-dev
+            - libcurl3
+            - libwxbase3.0-dev
+    - env: TARGET=desktop-version
+      addons:
+        apt:
+          packages:
+            - build-essential
+            - gnome-devel
+            - cmake
+            - git
+            - libnetcdf-dev
+            - libproj-dev
+            - libjasper-dev
+            - libcurl3
+            - libwxgtk3.0-dev
+    - env: TARGET=coverage-scan
       addons:
         apt:
           packages:
@@ -32,7 +45,7 @@ matrix:
             - libwxgtk3.0-dev
             - lcov
     - env:
-      - TARGET=coverity
+      - TARGET=coverity-scan
       - secure: "bXqSgc197UXhkRbLXXj/naGt/giYeM4HnOT4wyXLnL30QqXkmHuzA9jalaghnZYZv6nUiySFr+6ZivWs0ofJHYHEbS4vzE2NG11m+bWwmKbWrmX/gw+PBahg27pZXlVXel1yD4QNG2Gf3SU2yLBFdsZa7tLmfOHnddSUeJ/K8X2DZn7KNGGNfh0lm7JsZf7BhGul4q2J7vVlgqJqXBn+UiuXLrdCn/u3NhtWXpf7zFMI+MjVlXGx7hWj1HqVC43MAVOE3DVzupq93BtxDyTHRrdUZrMHf9rZtKRsr+F3F7xKS9ztJnTM16lDGjoZqeIf7kVj3okCPRIRsUSxx9roKu2ynBvBs8ZMtf37iQWcGJTkMZzV+4sK4aNEcmxPZC4LpigQl9WspZ42wNOvCW2pNsLAB7SAG7ktu3FETlZSMyQyHZHvs2zavc8MvRKHRKUOonhv8QKRTnB1aBDCp1bHpPSzhZ2CURjx8VGY5ZaGF8nJUs+YGEbzt2sDSUpW5vwPxX6lSlASVJI7eI5XMpyMlL8nS7zWP+g6CraeCnE/Hz1liWwm7RE/ONAG3a7KG6Ns6xWida/PtwmhE6qvMStRdY/okVIxD1I6f5w5L/Ek7viXuPxURCIktqc0iGEAqalJoCNi/Xhi0BurkEhvcTP2lWErEMGHsAC470tiGr6ZhGc="
       branches:
         only: coverity-scan
@@ -68,6 +81,6 @@ install:
 script:
   - chmod +x ci/travis/run-${TARGET}.sh
   - travis_wait 40 ci/travis/run-${TARGET}.sh
-  - if [[ "$TARGET" != "tests" ]]; then exit 0; fi
+  - if [[ "$TARGET" != "server-version" ]]; then exit 0; fi
   - cd tests
   - ctest -V
diff --git a/ci/travis/run-coverage.sh → ci/travis/run-coverage-scan.sh b/ci/travis/run-coverage.sh → ci/travis/run-coverage-scan.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-cmake CMakeLists.txt -DBUILD_OPTIMIZER=1 -DBUILD_FORECASTER=1 -DBUILD_VIEWER=1 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_CODECOV=1 -DGDAL_ROOT=$HOME/.libs/gdal
+cmake CMakeLists.txt -DBUILD_OPTIMIZER=1 -DBUILD_FORECASTER=1 -DBUILD_VIEWER=0 -DUSE_GUI=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_CODECOV=1 -DGDAL_ROOT=$HOME/.libs/gdal
 make -j$(nproc) atmoswing-coverage > /dev/null
 lcov --directory . --capture --output-file coverage.info &> /dev/null
 lcov --remove coverage.info '/usr/*' '*/external/*' '*/tests/*' --output-file coverage.info --quiet

diff --git a/ci/travis/run-coverity.sh → ci/travis/run-coverity-scan.sh b/ci/travis/run-coverity.sh → ci/travis/run-coverity-scan.sh
diff --git a/ci/travis/run-tests.sh → ci/travis/run-desktop-version.sh b/ci/travis/run-tests.sh → ci/travis/run-desktop-version.sh
diff --git a/ci/travis/run-server-version.sh b/ci/travis/run-server-version.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+cmake CMakeLists.txt -DBUILD_OPTIMIZER=1 -DBUILD_FORECASTER=1 -DUSE_GUI=0 -DCMAKE_BUILD_TYPE=RelWithDebInfo
+make -j$(nproc)