From 3475a59b022b793663a23abff6ae57ea26534cce Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Fri, 17 May 2019 21:37:48 -0400
Subject: [PATCH] Use different Qt version for xenial

---
 .ci/install.sh      | 27 +++++++++++++++++++--------
 azure-pipelines.yml |  8 ++++----
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 9b296412..72233549 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -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 \
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 51f2627f..4fe24f0c 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -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'