diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-31 07:24:51 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-31 07:24:51 +0800 |
| commit | 56a0131778df9e6f857001e3774fce4a6ef02b99 (patch) | |
| tree | 6c91fd5650c32432093b1757cedda946d4c17cae | |
| parent | 0bb3943698356dd4a12c082bdcab5c6031d91d6d (diff) | |
| download | go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar.gz go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar.bz2 go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar.lz go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar.xz go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.tar.zst go-tangerine-56a0131778df9e6f857001e3774fce4a6ef02b99.zip | |
Travis fixes for Qt5.4
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6911eec84..1b15e1763 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +2,16 @@ language: go go: - tip before_install: - - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa -y + - sudo add-apt-repository ppa:beineri/opt-qt54 -y - sudo apt-get update -qq - - sudo apt-get install -yqq libgmp3-dev qtbase5-private-dev qtdeclarative5-private-dev libqt5opengl5-dev libreadline6-dev + - sudo apt-get install -yqq libgmp3-dev libreadline6-dev qt54quickcontrols qt54webengine install: - go get code.google.com/p/go.tools/cmd/goimports - go get github.com/golang/lint/golint # - go get golang.org/x/tools/cmd/vet - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi - go get github.com/mattn/goveralls - - go get gopkg.in/qml.v1 + - go get -d github.com/obscuren/qml && cd $HOME/gopath/src/github.com/obscuren/qml && git checkout v1 && cd $TRAVIS_BUILD_DIR - ETH_DEPS=$(go list -f '{{.Imports}} {{.TestImports}} {{.XTestImports}}' github.com/ethereum/go-ethereum/... | sed -e 's/\[//g' | sed -e 's/\]//g' | sed -e 's/C //g'); if [ "$ETH_DEPS" ]; then go get $ETH_DEPS; fi before_script: - gofmt -l -w . @@ -22,5 +22,8 @@ before_script: script: - ./gocoverage.sh env: - - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64=" + global: + - PKG_CONFIG_PATH=/opt/qt54/lib/pkgconfig + - LD_LIBRARY_PATH=/opt/qt54/lib + - secure: "U2U1AmkU4NJBgKR/uUAebQY87cNL0+1JHjnLOmmXwxYYyj5ralWb1aSuSH3qSXiT93qLBmtaUkuv9fberHVqrbAeVlztVdUsKAq7JMQH+M99iFkC9UiRMqHmtjWJ0ok4COD1sRYixxi21wb/JrMe3M1iL4QJVS61iltjHhVdM64=" |