Skip to content

Commit 1217239

Browse files
committed
First attempt at fixing auto builds
1 parent 42e904b commit 1217239

File tree

1 file changed

+27
-4
lines changed

1 file changed

+27
-4
lines changed

scripts/travis_script.sh

+27-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
#!/bin/sh
22

33
if test "${BUILD_TYPE}" = "Coverity"; then
4-
source ./prebuild.sh
4+
git clone https://github.com/cmaughan/MUtils
5+
cd MUtils
6+
chmod +x prebuild.sh
7+
chmod +x m3rdparty/packages/install.sh
8+
./prebuild.sh
9+
mkdir build
10+
cd build
11+
cmake .. \
12+
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \
13+
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
14+
cmake --build . --target install
15+
cd ..
16+
cd ..
517
mkdir build
618
cd build
719
cmake .. \
@@ -10,13 +22,24 @@ if test "${BUILD_TYPE}" = "Coverity"; then
1022
-DPROJECT_UNITTESTS=no
1123
bash <(curl -s https://scan.coverity.com/scripts/travisci_build_coverity_scan.sh)
1224
else
13-
source ./prebuild.sh
25+
git clone https://github.com/cmaughan/MUtils
26+
cd MUtils
27+
chmod +x prebuild.sh
28+
chmod +x m3rdparty/packages/install.sh
29+
./prebuild.sh
30+
mkdir build
31+
cd build
32+
cmake .. \
33+
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \
34+
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
35+
cmake --build . --target install
36+
cd ..
37+
cd ..
1438
mkdir build
1539
cd build
1640
cmake .. \
1741
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} \
1842
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} \
19-
-DCMAKE_BUILD_TYPE=${BUILD_TYPE}
20-
cmake --build .
43+
-DPROJECT_UNITTESTS=no
2144
cmake --build . --target ${TEST_TARGET} -- ARGS=--output-on-failure
2245
fi

0 commit comments

Comments
 (0)