morpheus

commit 39647a86b0a3bb17f1167e7e5a126c3587b14b5a
parent b40fb4f2c19a7c5c82c55b70334a66431426996e
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 22 Aug 2017 00:30:59 +0200

Try to fix CI 4

Diffstat:
M
.ci/linux.sh
 | 
4
++++
M
appveyor.yml
 | 
4
+---
M
circle.yml
 | 
2
+-

3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.ci/linux.sh b/.ci/linux.sh
@@ -24,6 +24,10 @@ sudo rm -f /usr/bin/g++; sudo ln -s /usr/bin/g++-5 /usr/bin/g++
 sudo add-apt-repository -y ppa:beineri/opt-qt58-trusty
 sudo apt-get -qq update
 sudo apt-get -y -qq install qt583d qt58base qt58canvas3d qt58charts-no-lgpl qt58connectivity qt58creator qt58datavis3d-no-lgpl qt58declarative qt58doc qt58gamepad qt58graphicaleffects qt58imageformats qt58location qt58multimedia qt58qbs qt58quickcontrols qt58quickcontrols2 qt58script qt58scxml qt58sensors qt58serialbus qt58serialport qt58svg qt58tools qt58translations qt58virtualkeyboard-no-lgpl qt58webchannel qt58webengine qt58websockets qt58x11extras qt58xmlpatterns qt58speech qt58networkauth-no-lgpl && sudo apt-get -qq clean
+curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT https://download.qt.io/official_releases/qt/5.8/5.8.0/$QT
+chmod +x /tmp/$QT
+/tmp/$QT --script $GOPATH/src/github.com/therecipe/qt/internal/ci/iscript.qs
+rm -f /tmp/$QT
 
 #prepare env
 sudo chown $USER /usr/local/bin
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,7 +7,7 @@ install:
 
     set GOPATH=C:\work
 
-    git clone https://github.com/therecipe/qt.git %GOPATH%\src\github.com\therecipe\qt
+    go get -u -v github.com/therecipe/qt/cmd/...
 
     set QT=qt-opensource-windows-x86-android-5.8.0.exe
 
@@ -17,8 +17,6 @@ install:
 
     del %TMP%\%QT% /Q
 
-    go get -u -v github.com/therecipe/qt/cmd/...
-
     %GOPATH%\bin\qtsetup full desktop
 
 build_script:
diff --git a/circle.yml b/circle.yml
@@ -7,8 +7,8 @@ machine:
 dependencies:
   pre:
   override:
-      - if [[ "$OS" == "linux" ]]; then chmod +x ./.ci/linux.sh && ./.ci/linux.sh; fi
       - go get -u -v github.com/therecipe/qt/cmd/...
+      - if [[ "$OS" == "linux" ]]; then chmod +x ./.ci/linux.sh && ./.ci/linux.sh; fi
       - /home/ubuntu/.go_project/bin/qtsetup full desktop
       - go get -v github.com/Nordgedanken/Neo/...
   post: