Procházet zdrojové kódy

Travis CI: working configuration for Coverity Scan auto submission

Even with Clang, Ninja and debug set build takes extremely long and end just minute before timeout.

We should investigate using Gold linker for Linux builds on Travis and check what else can be done to speed up building process.
Arseniy Shestakov před 9 roky
rodič
revize
2b916189f6
2 změnil soubory, kde provedl 7 přidání a 7 odebrání
  1. 2 2
      .travis.linux
  2. 5 5
      .travis.yml

+ 2 - 2
.travis.linux

@@ -16,11 +16,11 @@ sudo apt-get update -qq
 
 sudo apt-get install -qq $SUPPORT
 sudo apt-get install -qq $PACKAGE
-sudo apt-get install -qq cmake libboost1.54-all-dev zlib1g-dev
+sudo apt-get install -qq cmake ninja-build libboost1.54-all-dev zlib1g-dev
 sudo apt-get install -qq libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev
 sudo apt-get install -qq libavformat-dev libswscale-dev
 sudo apt-get install -qq qt57declarative
 
 #setup compiler
 source /opt/qt57/bin/qt57-env.sh
-export CC=${REAL_CC} CXX=${REAL_CXX}
+export CC=${REAL_CC} CXX=${REAL_CXX}

+ 5 - 5
.travis.yml

@@ -14,7 +14,7 @@ before_install:
 before_script:
   - mkdir build
   - cd build
-  - cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS
+  - if [[ $TRAVIS_BRANCH != 'coverity_scan' ]]; then cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS; fi
 
 script:
   - test $TRAVIS_BRANCH != coverity_scan || exit 0
@@ -35,13 +35,13 @@ matrix:
   include:
     - os: linux
       compiler: clang
-      env: VCMI_PLATFORM='linux' REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4 SUPPORT=libstdc++-4.8-dev
+      env: VCMI_PLATFORM='linux' REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 PACKAGE=clang-3.6 SUPPORT=libstdc++-4.8-dev
     - os: linux
       compiler: clang
       env: VCMI_PLATFORM='linux' REAL_CC=clang-3.5 REAL_CXX=clang++-3.5 PACKAGE=clang-3.5 SUPPORT=libstdc++-4.8-dev
     - os: linux
       compiler: clang
-      env: VCMI_PLATFORM='linux' REAL_CC=clang-3.6 REAL_CXX=clang++-3.6 PACKAGE=clang-3.6 SUPPORT=libstdc++-4.8-dev
+      env: VCMI_PLATFORM='linux' REAL_CC=clang-3.4 REAL_CXX=clang++-3.4 PACKAGE=clang-3.4 SUPPORT=libstdc++-4.8-dev
     - os: linux
       compiler: gcc
       env: VCMI_PLATFORM='linux' REAL_CC=gcc-4.8   REAL_CXX=g++-4.8     PACKAGE=g++-4.8   SUPPORT=
@@ -57,8 +57,8 @@ addons:
       name: vcmi/vcmi
       description: Build submitted via Travis CI
     notification_email: [email protected]
-    build_command_prepend: cmake -G "Unix Makefiles" . -DENABLE_LAUNCHER=1 -DENABLE_TEST=1
-    build_command: make
+    build_command_prepend: "cov-configure --compiler clang-3.6 --comptype clangcc && cov-configure --comptype clangcxx --compiler clang++-3.6 && cmake -G Ninja .. -DCMAKE_BUILD_TYPE=DEBUG -DENABLE_LAUNCHER=1 -DENABLE_TEST=1"
+    build_command: ninja
     branch_pattern: coverity_scan
 
 notifications: