Fix travis (#76)

This commit is contained in:
xarkes 2017-10-23 23:08:36 +02:00 committed by GitHub
parent 08a8550b88
commit a45fd094ad

View File

@ -5,7 +5,7 @@ cache: ccache
matrix: matrix:
include: include:
- os: linux - os: linux
env: TEST_COMMAND="qmake PREFIX=/usr APPIMAGE=1 ../src && make -j4" DEPLOY=1 PREFIX=/tmp/.cutter_usr env: TEST_COMMAND="qmake PREFIX=/usr APPIMAGE=1 ../src && make -j4" DEPLOY=1
- os: linux - os: linux
env: TEST_COMMAND="cmake ../src && make -j4" env: TEST_COMMAND="cmake ../src && make -j4"
- os: osx - os: osx
@ -29,7 +29,7 @@ install:
export PATH="/usr/local/opt/qt/bin:$PATH" export PATH="/usr/local/opt/qt/bin:$PATH"
; fi ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
sudo apt-get -y install qt59base && sudo apt-get -y install qt59base --allow-unauthenticated &&
source /opt/qt5*/bin/qt5*-env.sh source /opt/qt5*/bin/qt5*-env.sh
; fi ; fi
@ -55,7 +55,7 @@ before_script:
- git submodule init ; git submodule update - git submodule init ; git submodule update
- cd radare2 - cd radare2
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
mkdir -p $PREFIX sed -i 's,R2_PREFIX.*,R2_PREFIX "/tmp/.cutter_usr",' libr/include/r_userconf.h.acr;
INSTALL_TARGET=install sys/install.sh; INSTALL_TARGET=install sys/install.sh;
else else
LDFLAGS=-headerpad_max_install_names INSTALL_TARGET=install sys/install.sh; LDFLAGS=-headerpad_max_install_names INSTALL_TARGET=install sys/install.sh;