more ci updates

This commit is contained in:
Joe 2019-02-24 17:29:51 -05:00
parent bc1390125b
commit d57a9dee81
3 changed files with 6 additions and 9 deletions

View File

@ -38,11 +38,12 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
./configure && make && make check && sudo make install ./configure && make && make check && sudo make install
popd popd
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -qq -y \ sudo apt-get install -qq -y \
qtbase5-dev \ qt${QT_PKG}base \
qttools5-dev \ qt${QT_PKG}tools \
libqt5svg5-dev \ qt${QT_PKG}svg \
qtmultimedia5-dev \ qt${QT_PKG}multimedia \
liblmdb-dev liblmdb-dev
fi fi

View File

@ -13,10 +13,6 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then
sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}" sudo update-alternatives --set g++ "/usr/bin/${CXX_COMPILER}"
fi 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 if [ "$TRAVIS_OS_NAME" == "osx" ]; then
export CMAKE_PREFIX_PATH=/usr/local/opt/qt5 export CMAKE_PREFIX_PATH=/usr/local/opt/qt5
fi fi

View File

@ -1,6 +1,6 @@
language: cpp language: cpp
sudo: required sudo: required
dist: bionic dist: trusty
notifications: notifications:
webhooks: webhooks: