Skip to content

Commit 19539ed

Browse files
committed
Fix travis
1 parent b94141d commit 19539ed

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

.travis.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ matrix:
4242
- libgraphviz-dev
4343
- qt5-default
4444
- libqt5svg5-dev
45-
- cmake
4645
before_install:
4746
- pyenv install 3.5.2
4847
- pyenv global 3.5.2
@@ -104,14 +103,20 @@ install:
104103
scripts/fetch_deps.sh;
105104
source cutter-deps/env.sh;
106105
fi
106+
- CMAKE_VERSION=3.14.7
107107
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
108108
export PATH=/usr/local/opt/llvm/bin:$PATH;
109109
source scripts/prepare_breakpad_macos.sh;
110+
brew install cmake || brew upgrade cmake;
110111
fi
111112
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
112113
export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH";
113114
source scripts/prepare_breakpad_linux.sh;
115+
CMAKE_URL="https://cmake.org/files/v${CMAKE_VERSION%.[0-9]}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz";
116+
mkdir cmake && travis_retry wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake;
117+
export PATH=${DEPS_DIR}/cmake/bin:${PATH};
114118
fi
119+
- cmake --version
115120

116121
before_script:
117122
- cd radare2
@@ -148,8 +153,10 @@ script:
148153
-DCUTTER_ENABLE_PYTHON_BINDINGS=ON
149154
-DCUTTER_ENABLE_CRASH_REPORTS=ON
150155
-DCUTTER_USE_BUNDLED_RADARE2=ON
156+
-DCUTTER_ENABLE_TESTS=ON
151157
../src &&
152158
make -j4;
159+
./test/CutterTest;
153160
elif [[ "$BUILD_SYSTEM" == "cmake_nodep" ]]; then
154161
cmake
155162
-DCMAKE_BUILD_TYPE=Release
@@ -181,8 +188,10 @@ script:
181188
-DCUTTER_ENABLE_CRASH_REPORTS=ON
182189
-DCUTTER_USE_BUNDLED_RADARE2=ON
183190
-DBREAKPAD_FRAMEWORK_DIR="$BREAKPAD_FRAMEWORK_DIR"
191+
-DCUTTER_ENABLE_TESTS=ON
184192
../src &&
185193
make -j4;
194+
./test/CutterTest;
186195
fi
187196
fi
188197

0 commit comments

Comments
 (0)