[wip]

mosra · May 19, 2017 · 11b7954 · 11b7954
1 parent 0466362
commit 11b7954
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/package/ci/travis-android-arm.sh b/package/ci/travis-android-arm.sh
@@ -3,6 +3,9 @@ set -ev
 
 git submodule update --init
 
+cmake --version
+$HOME/cmake/bin/cmake --version
+
 # Build native corrade-rc
 mkdir build && cd build
 cmake .. \

diff --git a/package/ci/travis.yml b/package/ci/travis.yml
@@ -86,7 +86,7 @@ install:
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ]; then wget -nc http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin && chmod +x android-*.bin && ./android-*.bin -y | grep -v Extracting; fi
 # Because Android build has to use 12.04 and CMake 2.8.12 stopped working there
 # since May 2017, I have to manually download a prebuilt version
-- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ] && [ ! -e "$HOME/cmake/bin" ]; then wget -nc --no-check-certificate https://cmake.org/files/v2.8/cmake-2.8.12.2-Linux-i386.tar.gz && mkdir -p cmake && cd cmake && tar --strip-components=1 -xzvf ../cmake-2.8.12.2-Linux-i386.tar.gz && export PATH=$HOME/cmake/bin:$PATH && cd .. ; fi
+- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "android" ] && [ ! -e "$HOME/cmake/bin" ]; then wget -nc --no-check-certificate https://cmake.org/files/v2.8/cmake-2.8.12.2-Linux-i386.tar.gz && mkdir -p cmake && cd cmake && tar --strip-components=1 -xzvf ../cmake-2.8.12.2-Linux-i386.tar.gz && export PATH=$HOME/cmake/bin:$PATH && cd .. && cmake --version ; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ] && [ "$TARGET" == "ios-simulator" ]; then gem install xcpretty; fi
 # Emscripten 1.37.10 is broken (crashes during optimization), using 1.37.1