From ec9143e97635250e2de127eca1126595b91d30e8 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Mon, 7 May 2018 15:15:40 -0700 Subject: [PATCH] debug/release: Add minimal debug/release CI builds This commit enables both a minimal DEBUG and minimal RELEASE build on Travis-CI. Signed-off-by: Noel Eck --- .travis.yml | 10 ++++++++-- docker-compose.yaml | 1 + scripts/run-cmake.sh | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d985ce32..42252dba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,17 @@ jobs: include: - &run-with-clang-minimal stage: Clang 3.8 - minimal with unit tests - env: TARGET=minimal + env: + - TARGET=minimal + - CMAKE_BUILD_TYPE=Debug before_script: docker-compose pull ${TARGET} script: - export CC=clang-3.8 CXX=clang++-3.8 - - BUILDARCH=MOCK docker-compose run ${TARGET} + - docker-compose run ${TARGET} + - <<: *run-with-clang-minimal + env: + - TARGET=minimal + - CMAKE_BUILD_TYPE=Release - &run-with-clang stage: Clang 3.8 env: TARGET=python diff --git a/docker-compose.yaml b/docker-compose.yaml index 2f5cce39..1bb54b75 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,6 +16,7 @@ services: - BUILDCORDOVA=${BUILDCORDOVA:-OFF} - BUILDSWIGNODE=${BUILDSWIGNODE:-OFF} - BUILDEXAMPLES=${BUILDEXAMPLES:-OFF} + - CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release} - IPK=${IPK:-OFF} - RPM=${RPM:-OFF} - NPM=${NPM:-OFF} diff --git a/scripts/run-cmake.sh b/scripts/run-cmake.sh index 8b0a693c..db982ea6 100755 --- a/scripts/run-cmake.sh +++ b/scripts/run-cmake.sh @@ -20,5 +20,6 @@ cmake \ -DBUILDTESTS=$BUILDTESTS \ -DWERROR=$WERROR \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -H. \ -Bbuild