more ci updates
This commit is contained in:
parent
bc1390125b
commit
d57a9dee81
@ -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
|
@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
language: cpp
|
||||
sudo: required
|
||||
dist: bionic
|
||||
dist: trusty
|
||||
|
||||
notifications:
|
||||
webhooks:
|
||||
|
Loading…
Reference in New Issue
Block a user