feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Travis: Assume CMake is installed

Browse Source
This commit is contained in:
Benoit Blanchon
2019-02-28 17:26:29 +01:00
parent 77f38e4449
commit 27c08b785d
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/travis/cmake.sh
View File

@ -1,16 +1,5 @@
#!/bin/sh -ex #!/bin/sh -ex
if [ "$(uname)" = 'Darwin' ]; then
URL=https://cmake.org/files/v3.4/cmake-3.4.3-Darwin-x86_64.tar.gz
CMAKE=/tmp/CMake.app/Contents/bin/cmake
CTEST=/tmp/CMake.app/Contents/bin/ctest
else
URL=https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz
CMAKE=/tmp/bin/cmake
CTEST=/tmp/bin/ctest
fi
curl -sS $URL | tar xz -C /tmp --strip 1
if [ -n "$GCC" ]; then if [ -n "$GCC" ]; then
export CC="gcc-$GCC" export CC="gcc-$GCC"
export CXX="g++-$GCC" export CXX="g++-$GCC"
@ -28,6 +17,6 @@ else
BUILD_TYPE="Release" BUILD_TYPE="Release"
fi fi
$CMAKE -DCMAKE_BUILD_TYPE=$BUILD_TYPE . cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .
$CMAKE --build . cmake --build .
$CTEST --output-on-failure . ctest --output-on-failure .

4
scripts/travis/coverage.sh
View File

@ -1,8 +1,6 @@
#!/bin/sh -eux #!/bin/sh -eux
curl https://cmake.org/files/v3.4/cmake-3.4.0-Linux-x86_64.tar.gz | tar xz -C /tmp --strip 1 cmake -DCOVERAGE=true .
/tmp/bin/cmake -DCOVERAGE=true .
make make
make test make test