diff options
| author | Joe <rubberduckie3554@gmail.com> | 2019-02-24 17:29:51 -0500 |
|---|---|---|
| committer | Joe <rubberduckie3554@gmail.com> | 2019-02-24 17:29:51 -0500 |
| commit | d57a9dee815c774ef809c6a1ed4c310b903ab0f3 (patch) | |
| tree | 81b9ccd51b5e871166e0eb8bc8d995e84705eed1 /.ci | |
| parent | bc1390125b1f978cd8046673db4ed8db1a67b8a3 (diff) | |
more ci updates
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/install.sh | 9 | ||||
| -rwxr-xr-x | .ci/script.sh | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index 56e5fb45..585526c1 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -38,11 +38,12 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./configure && make && make check && sudo make install popd + sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty sudo apt-get update -qq sudo apt-get install -qq -y \ - qtbase5-dev \ - qttools5-dev \ - libqt5svg5-dev \ - qtmultimedia5-dev \ + qt${QT_PKG}base \ + qt${QT_PKG}tools \ + qt${QT_PKG}svg \ + qt${QT_PKG}multimedia \ liblmdb-dev fi
\ No newline at end of file diff --git a/.ci/script.sh b/.ci/script.sh index 435f2c27..4f8101ef 100755 --- a/.ci/script.sh +++ b/.ci/script.sh @@ -13,10 +13,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}" fi -if [ "$TRAVIS_OS_NAME" == "linux" ]; then - source /opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh || true; -fi - if [ "$TRAVIS_OS_NAME" == "osx" ]; then export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 fi |