trigger travis + appveyor

This commit is contained in:
therecipe 2016-10-06 16:53:27 +02:00
parent 2b78961b0e
commit 1183c70737
3 changed files with 12 additions and 23 deletions

View file

@ -24,8 +24,8 @@ matrix:
env: DESKTOP=false ANDROID=false IOS=false SAILFISH=true
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 20 $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 30 $GOPATH/src/github.com/therecipe/qt/internal/ci/darwin.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 25 $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then travis_wait 45 $GOPATH/src/github.com/therecipe/qt/internal/ci/darwin.sh; fi
before_script:
- sudo chown $USER /usr/local/bin/

View file

@ -1,10 +1,13 @@
#!/bin/sh
set -ev
#
#check env
df -h
diskutil list
ls $HOME/*
du -sh $HOME/*
#download and install qt
if [ "$IOS" == "true" ]
then
@ -55,16 +58,9 @@ diskutil unmountDisk disk1
rm -f /tmp/$SFDK
fi
#
#check env
df -h
diskutil list
ls $HOME
ls $HOME/*
ls $HOME/$SDK
ls $HOME/$NDK
du -sh $HOME
du -sh $HOME/*
du -sh $HOME/$SDK
du -sh $HOME/$NDK

View file

@ -1,9 +1,12 @@
#!/bin/sh
set -ev
#
#check env
df -h
ls $HOME/*
du -sh $HOME/*
#needed for headless qt installation
export QT_QPA_PLATFORM=minimal
@ -21,8 +24,6 @@ chmod +x /tmp/$QT
/tmp/$QT --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
rm -f /tmp/$QT
if [ "$ANDROID" == "true" ]
then
#download and install android sdk
SDK=android-sdk_r24.4.1-linux.tgz
curl -sL --retry 3 -o /tmp/$SDK https://dl.google.com/android/$SDK
@ -37,17 +38,9 @@ NDK=android-ndk-r12b-linux-x86_64.zip
curl -sL --retry 3 -o /tmp/$NDK https://dl.google.com/android/repository/$NDK
unzip -qq /tmp/$NDK -d $HOME
rm -f /tmp/$NDK
fi
#
#check env
df -h
ls $HOME
ls $HOME/*
ls $HOME/$SDK
ls $HOME/$NDK
du -sh $HOME
du -sh $HOME/*
du -sh $HOME/$SDK
du -sh $HOME/$NDK