commit b66f485da550695113a6149ca74775f16a86d0f9 parent cb39c3f732da600dfb61fa2d6a62fa440bcfb8a6 Author: MTRNord <mtrnord1@gmail.com> Date: Tue, 5 Dec 2017 20:45:12 +0100 Not update gcc Signed-off-by: MTRNord <mtrnord1@gmail.com> Diffstat:
| M | .ci/linux.sh | | | 3 | --- |
| M | .circleci/config.yml | | | 7 | ++++--- |
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.ci/linux.sh b/.ci/linux.sh @@ -15,9 +15,6 @@ sudo apt-get -y install libpulse-dev software-properties-common && sudo apt-get #replace gcc4 with gcc5 sudo apt-get update -sudo apt-get -y install gcc-5 g++-5 && sudo apt-get 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 diff --git a/.circleci/config.yml b/.circleci/config.yml @@ -3,11 +3,12 @@ jobs: build: docker: - image: circleci/golang:latest + environment: + OS: linux + DESKTOP: true + QT_PKG_CONFIG: true steps: - checkout - - run: echo 'export OS=linux' >> $BASH_ENV - - run: echo 'export DESKTOP=true' >> $BASH_ENV - - run: echo 'export QT_PKG_CONFIG=true' >> $BASH_ENV - run: name: qt-binding command: go get -u -v github.com/therecipe/qt/cmd/...