commit b54d8923a43940a0655e26c8cfde490b8f4b2d04 parent 29dd9b84bd88fd4fefad283919c714a67b040e59 Author: MTRNord <mtrnord1@gmail.com> Date: Wed, 6 Dec 2017 13:03:57 +0100 Merge branch 'feature/CI_Changes' into develop Diffstat:
| D | .ci/linux.sh | | | 43 | ------------------------------------------- |
| A | .circleci/config.yml | | | 19 | +++++++++++++++++++ |
| D | circle.yml | | | 19 | ------------------- |
3 files changed, 19 insertions(+), 62 deletions(-)
diff --git a/.ci/linux.sh b/.ci/linux.sh @@ -1,43 +0,0 @@ -#!/bin/bash -set -ev - -#check env -df -h - -ls $HOME/* -du -sh $HOME/* - -#needed for headless qt installation -export QT_QPA_PLATFORM=minimal - -#additional deps for multimedia -sudo apt-get -y -qq install libpulse-dev && sudo apt-get -qq clean - -#replace gcc4 with gcc5 -sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test -sudo apt-get -qq update -sudo apt-get -y -qq install gcc-5 g++-5 && sudo apt-get -qq clean -sudo rm -f /usr/bin/gcc; sudo ln -s /usr/bin/gcc-5 /usr/bin/gcc -sudo rm -f /usr/bin/g++; sudo ln -s /usr/bin/g++-5 /usr/bin/g++ - -#download and install qt -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 -QT=qt-unified-linux-x64-online.run -curl -sL --retry 10 --retry-delay 10 -o /tmp/$QT https://download.qt.io/official_releases/online_installers/$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 -sudo chown $USER $GOROOT/pkg | true - -#check env -df -h - -ls $HOME/* -du -sh $HOME/* - -exit 0 diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -0,0 +1,19 @@ +version: 2 +jobs: + build: + docker: + - image: therecipe/qt:linux + environment: + DESKTOP: true + steps: + - run: + name: Get Morpheus + command: go get -u -v -d github.com/Nordgedanken/Morpheus/... + - run: + name: Run Build + working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/ + command: $GOPATH/bin/qtdeploy build desktop + - run: + name: Run Tests + working_directory: /home/user/work/src/github.com/Nordgedanken/Morpheus/ + command: $GOPATH/bin/qtdeploy test desktop diff --git a/circle.yml b/circle.yml @@ -1,19 +0,0 @@ -machine: - environment: - OS: linux - DESKTOP: true - GOROOT: /usr/local/go - GOPATH: /home/ubuntu/.go_project -dependencies: - pre: - override: - - 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/Morpheus/... - post: -test: - pre: - override: - - if [[ "$DESKTOP" == "true" ]]; then /home/ubuntu/.go_project/bin/qtsetup && /home/ubuntu/.go_project/bin/qtdeploy test desktop; fi - post: