Use different Qt version for xenial

azure-pipelines
Joseph Donofry 6 years ago
parent c9ad2c2df0
commit 3475a59b02
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
  1. 27
      .ci/install.sh
  2. 8
      azure-pipelines.yml

@ -37,13 +37,25 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
cd libsodium-1.0.16/
./configure && make && make check && sudo make install )
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main" | sudo tee /etc/apt/sources.list.d/llvm.list
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
# needed for git-lfs, otherwise the follow apt update fails.
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
UBUNTU_RELEASE = $(lsb_release -sc)
if [ "$UBUNTU_RELEASE" eq "trusty" ]
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty main"
sudo apt-get update -qq
sudo apt-get install -qq -y clang-5.0
sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty
# needed for git-lfs, otherwise the follow apt update fails.
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 6B05F25D762E3157
elif [ "$UBUNTU_RELEASE" eq "xenial" ]
curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main"
sudo apt-get update -qq
sudo apt-get install -qq -y clang-6.0
sudo add-apt-repository ppa:beineri/opt-qt-5.11.1-xenial
fi
# needed for mongodb repository: https://github.com/travis-ci/travis-ci/issues/9037
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
@ -51,7 +63,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo apt update -qq
sudo apt install -qq -y \
g++-8 \
ninja-build \
qt${QT_PKG}base \
qt${QT_PKG}tools \

@ -18,10 +18,10 @@ stages:
pool:
vmImage: 'ubuntu-16.04'
variables:
CXX_COMPILER: 'clang++-5.0'
C_COMPILER: 'clang-5.0'
QT_VERSION: '592'
QT_PKG: '59'
CXX_COMPILER: 'clang++-6.0'
C_COMPILER: 'clang-6.0'
QT_VERSION: '5.11.1'
QT_PKG: '511'
USE_BUNDLED_BOOST: '1'
USE_BUNDLED_CMARK: '1'
USE_BUNDLED_JSON: '1'

Loading…
Cancel
Save