trigger travis + appveyor

This commit is contained in:
therecipe 2016-10-06 18:34:00 +02:00
parent 1183c70737
commit 8922c05a04
2 changed files with 11 additions and 3 deletions

View file

@ -24,14 +24,14 @@ matrix:
env: DESKTOP=false ANDROID=false IOS=false SAILFISH=true
install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 25 $GOPATH/src/github.com/therecipe/qt/internal/ci/linux.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then travis_wait 30 $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/
script:
- if [[ "$DESKTOP" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh; fi
- if [[ "$DESKTOP" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh; else go run $GOPATH/src/github.com/therecipe/qt/internal/setup/generate.go; fi
- if [[ "$ANDROID" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh android; fi
- if [[ "$IOS" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh ios; fi
- if [[ "$IOS" == "true" ]]; then $GOPATH/src/github.com/therecipe/qt/setup.sh ios-simulator; fi

View file

@ -421,6 +421,10 @@ func build() {
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "MerSDK", "--name", "GOROOT", "--hostpath", runtime.GOROOT(), "--automount"), "buid.vboxSharedFolder_GOROOT")
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "MerSDK", "--name", "GOPATH", "--hostpath", os.Getenv("GOPATH"), "--automount"), "buid.vboxSharedFolder_GOPATH")
if strings.ToLower(os.Getenv("CI")) == "true" {
runCmd(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "modifyvm", "MerSDK", "--hwvirtex", "off"), "buid.vboxDisableHwVirtualization")
}
if runtime.GOOS == "windows" {
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "--type", "headless", "MerSDK"), "build.vboxStartSDK")
} else {
@ -428,7 +432,7 @@ func build() {
}
if strings.ToLower(os.Getenv("CI")) == "true" {
time.Sleep(1 * time.Minute)
time.Sleep(30 * time.Second)
} else {
time.Sleep(10 * time.Second)
}
@ -975,6 +979,10 @@ func run() {
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "registervm", filepath.Join(utils.SAILFISH_DIR(), "emulator", "SailfishOS Emulator", "SailfishOS Emulator.vbox")), "buid.vboxRegisterEmulator")
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "sharedfolder", "add", "SailfishOS Emulator", "--name", "GOPATH", "--hostpath", os.Getenv("GOPATH"), "--automount"), "run.vboxSharedFolder_GOPATH")
if strings.ToLower(os.Getenv("CI")) == "true" {
runCmd(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "modifyvm", "SailfishOS Emulator", "--hwvirtex", "off"), "buid.vboxDisableHwVirtualization")
}
if runtime.GOOS == "windows" {
runCmdOptional(exec.Command(filepath.Join(utils.VIRTUALBOX_DIR(), "vboxmanage"), "startvm", "SailfishOS Emulator"), "run.vboxStartEmulator")
} else {