Merge branch 'devel' into bug/rnistuk/kep-1534

bluzelle · Jun 24, 2019 · 0c286fe · 0c286fe
2 parents 72098da + bf99857
commit 0c286fe
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -82,10 +82,10 @@ before_script:
   - mkdir build
   - cd build
   - >
-    if { [ "$TRAVIS_BRANCH" = "master" ] || [ $TRAVIS_BRANCH == *"release"* ]; } && [ $TRAVIS_OS_NAME = "linux" ] ; then
-        ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR} -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH} ..
-      else
-        ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR} -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH} ..
+    if { [ "$TRAVIS_BRANCH" = "master" ] || [[ $TRAVIS_BRANCH == *"release"* ]]; } && [ $TRAVIS_OS_NAME = "linux" ] ; then
+      ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR} -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH} ..
+    else
+      ${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE=Debug -DENABLE_GCOV=ON -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR} -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR} -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH} ..
     fi
 
 script: