trigger travis

This commit is contained in:
therecipe 2016-10-05 12:46:59 +02:00
parent c25cf500d4
commit 89a8cd9b7c
7 changed files with 69 additions and 7 deletions

View file

@ -14,18 +14,21 @@ matrix:
- os: osx
osx_image: xcode7.2
before_install:
- export QT_QPA_PLATFORM=minimal
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then $GOPATH/src/github.com/therecipe/qt/internal/ci/darwin.sh; fi
before_script:
- killall "Qt Creator"
- sudo chown $USER /usr/local/bin/
- export QT_QPA_PLATFORM=minimal
script:
- $GOPATH/src/github.com/therecipe/qt/setup.sh
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh ios; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh ios-simulator; fi
#- $GOPATH/src/github.com/therecipe/qt/setup.sh android
#- $GOPATH/src/github.com/therecipe/qt/setup.sh sailfish
#- $GOPATH/src/github.com/therecipe/qt/setup.sh sailfish-emulator
- $GOPATH/src/github.com/therecipe/qt/setup.sh sailfish
- $GOPATH/src/github.com/therecipe/qt/setup.sh sailfish-emulator

View file

@ -3,6 +3,30 @@ set -ev
#download and install qt
curl -sL -o /tmp/qt-opensource-mac-x64-android-ios-5.7.0.dmg https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-mac-x64-android-ios-5.7.0.dmg
open /tmp/qt-opensource-mac-x64-android-ios-5.7.0.dmg
QT_QPA_PLATFORM=minimal /Volumes/qt-opensource-mac-x64-android-ios-5.7.0/qt-opensource-mac-x64-android-ios-5.7.0.app/Contents/MacOS/qt-opensource-mac-x64-android-ios-5.7.0 --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
hdiutil attach /tmp/qt-opensource-mac-x64-android-ios-5.7.0.dmg
/Volumes/qt-opensource-mac-x64-android-ios-5.7.0/qt-opensource-mac-x64-android-ios-5.7.0.app/Contents/MacOS/qt-opensource-mac-x64-android-ios-5.7.0 --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
diskutil unmountDisk disk2
#download and install android sdk
curl -sL -o /tmp/android-sdk_r24.4.1-macosx.zip https://dl.google.com/android/android-sdk_r24.4.1-macosx.zip
unzip /tmp/android-sdk_r24.4.1-macosx.zip -d /tmp
export ANDROID_SDK_DIR=/tmp/android-sdk-macosx
#install deps for android sdk
#download and install android ndk
curl -sL -o /tmp/android-ndk-r12b-darwin-x86_64.zip https://dl.google.com/android/repository/android-ndk-r12b-darwin-x86_64.zip
unzip /tmp/android-ndk-r12b-darwin-x86_64.zip -d /tmp
export ANDROID_NDK_DIR=/tmp/android-ndk-r12b
#download and install virtualbox
curl -sL -o /tmp/VirtualBox-5.1.6-110634-OSX.dmg http://download.virtualbox.org/virtualbox/5.1.6/VirtualBox-5.1.6-110634-OSX.dmg
hdiutil attach /tmp/VirtualBox-5.1.6-110634-OSX.dmg
sudo installer -pkg VirtualBox.pkg -target /
diskutil unmountDisk disk2
#download and install sailfish sdk
curl -sL -o /tmp/SailfishOSSDK-Beta-1608-Qt5-mac-offline.dmg https://releases.sailfishos.org/sdk/installers/1608/SailfishOSSDK-Beta-1608-Qt5-mac-offline.dmg
hdiutil attach /tmp/SailfishOSSDK-Beta-1608-Qt5-mac-offline.dmg
/Volumes/SailfishOSSDK-mac-offline-160801/SailfishOSSDK-mac-offline-160801.app/Contents/MacOS/SailfishOSSDK-mac-offline-160801 --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscriptcd.qs
diskutil unmountDisk disk2

View file

@ -1,5 +1,10 @@
function Controller()
{
installer.wizardPageInsertionRequested.connect(function(widget, page)
{
installer.removeWizardPage(installer.components()[0], "WorkspaceWidget");
})
installer.autoRejectMessageBoxes();
installer.installationFinished.connect(function()
{

View file

@ -10,4 +10,27 @@ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 90
#download and install qt
curl -sL -o /tmp/qt-opensource-linux-x64-android-5.7.0.run https://download.qt.io/official_releases/qt/5.7/5.7.0/qt-opensource-linux-x64-android-5.7.0.run
chmod +x /tmp/qt-opensource-linux-x64-android-5.7.0.run && QT_QPA_PLATFORM=minimal /tmp/qt-opensource-linux-x64-android-5.7.0.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
chmod +x /tmp/qt-opensource-linux-x64-android-5.7.0.run
/tmp/qt-opensource-linux-x64-android-5.7.0.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
#download and install android sdk
curl -sL -o /tmp/android-sdk_r24.4.1-linux.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
tar -xzf /tmp/android-sdk_r24.4.1-linux.tgz -C /tmp
export ANDROID_SDK_DIR=/tmp/android-sdk-linux
#install deps for android sdk
#download and install android ndk
curl -sL -o /tmp/android-ndk-r12b-linux-x86_64.zip https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip
unzip /tmp/android-ndk-r12b-linux-x86_64.zip -d /tmp
export ANDROID_NDK_DIR=/tmp/android-ndk-r12b
#download and install virtualbox
curl -sL -o /tmp/VirtualBox-5.1.6-110634-Linux_amd64.run http://download.virtualbox.org/virtualbox/5.1.6/VirtualBox-5.1.6-110634-Linux_amd64.run
chmod +x /tmp/VirtualBox-5.1.6-110634-Linux_amd64.run
sudo /tmp/VirtualBox-5.1.6-110634-Linux_amd64.run
#download and install sailfish sdk
curl -sL -o /tmp/SailfishOSSDK-Beta-1608-Qt5-linux-64-offline.run https://releases.sailfishos.org/sdk/installers/1608/SailfishOSSDK-Beta-1608-Qt5-linux-64-offline.run
chmod +x /tmp/SailfishOSSDK-Beta-1608-Qt5-linux-64-offline.run
/tmp/SailfishOSSDK-Beta-1608-Qt5-linux-64-offline.run --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs

View file

@ -96,7 +96,7 @@ func args() {
}
}
if buildTarget == "sailfish" || buildTarget == "sailfish-emulator" {
if buildTarget == "sailfish" || buildTarget == "sailfish-emulator" || os.Getenv("TRAVIS") == "true" {
buildMinimal = true
}

View file

@ -228,6 +228,10 @@ func main() {
}
}
if os.Getenv("TRAVIS") == "true" {
return
}
fmt.Println("------------------------install-------------------------")
for _, m := range templater.GetLibs() {

View file

@ -102,6 +102,9 @@ func JDK_DIR() string {
if dir := os.Getenv("JDK_DIR"); dir != "" {
return filepath.Clean(dir)
}
if dir := os.Getenv("JAVA_HOME"); dir != "" {
return filepath.Clean(dir)
}
switch runtime.GOOS {
case "windows":