Update CI

This commit is contained in:
Corentin Le Molgat
2019-04-09 09:31:35 +02:00
parent a49b9143a4
commit e9dc8a6651
2 changed files with 15 additions and 11 deletions

View File

@@ -44,7 +44,7 @@ before_build:
- set "JAVA_HOME=C:\Program Files\Java\jdk11"
- set "PATH=C:\Program Files\Java\jdk11\bin;%PATH%"
- java -version
- if "%BUILDER%"=="cmake" cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -G "%CMAKE_GENERATOR%" || VER>NUL
- if "%BUILDER%"=="cmake" cmake -H. -Bbuild -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_DEPS:BOOL=ON -G "%CMAKE_GENERATOR%" || VER>NUL
- if "%BUILDER%"=="make" del "C:\Program Files\Git\usr\bin\sh.exe"
- if "%BUILDER%"=="make" tools\make.exe detect

View File

@@ -133,6 +133,7 @@ fi
## CMAKE ##
#############
if [ "${BUILDER}" == cmake ];then
export CMAKE_BUILD_PARALLEL_LEVEL=4
if [ "${TRAVIS_OS_NAME}" == linux ];then
echo 'travis_fold:start:env'
# Add clang support in ccache
@@ -144,7 +145,7 @@ if [ "${BUILDER}" == cmake ];then
sudo ln -s ../../bin/ccache /usr/lib/ccache/clang++
export CXXFLAGS="-Qunused-arguments $CXXFLAGS"
fi
export PATH="${HOME}"/swig/bin:"${PATH}"
export PATH="${HOME}/swig/bin:${PATH}"
pyenv global system 3.7
checkenv
echo 'travis_fold:end:env'
@@ -155,19 +156,22 @@ if [ "${BUILDER}" == cmake ];then
echo 'travis_fold:end:env'
fi
echo 'travis_fold:start:configure'
cmake -H. -Bbuild || true
echo 'travis_fold:end:configure'
echo 'travis_fold:start:configure'
cmake -H. -Bbuild -DBUILD_DEPS:BOOL=ON
echo 'travis_fold:end:configure'
echo 'travis_fold:start:build'
cmake --build build --target all -- --jobs=4
echo 'travis_fold:end:build'
echo 'travis_fold:start:build'
cmake --build build --target all
echo 'travis_fold:end:build'
echo 'travis_fold:start:test'
cmake --build build --target test -- CTEST_OUTPUT_ON_FAILURE=1
echo 'travis_fold:end:test'
echo 'travis_fold:start:test'
cmake --build build --target test -- CTEST_OUTPUT_ON_FAILURE=1
echo 'travis_fold:end:test'
fi
#############
## BAZEL ##
#############
if [ "${BUILDER}" == bazel ]; then
echo 'travis_fold:start:build'
bazel build --curses=no --copt='-Wno-sign-compare' //...:all