From a846f0276d7e5690de89a5cb4cd2730427f81a1a Mon Sep 17 00:00:00 2001
From: Michael Schuster <michael@schuster.ms>
Date: Sun, 17 Nov 2019 01:30:53 +0100
Subject: [PATCH] Bump Qt 5.12.5 image

Signed-off-by: Michael Schuster <michael@schuster.ms>
---
 .drone.yml | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index e5f8204c5..121e1b97e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -237,13 +237,17 @@ name: qt-5.12
 
 steps:
 - name: build and test
-  image: nextcloudci/client-5.12:client-5.12-3
+  image: nextcloudci/client-5.12:client-5.12-5
   commands:
     # Install QtKeyChain
     - /bin/bash -c "
       export CC=gcc-7 &&
       export CXX=g++-7 &&
-      source /opt/qt512/bin/qt512-env.sh &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      export QTDIR=$QT_BASE_DIR &&
+      export PATH=$QT_BASE_DIR/bin:$PATH &&
+      export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
       cd /tmp &&
       git clone https://github.com/frankosterfeld/qtkeychain.git &&
       cd qtkeychain &&
@@ -257,7 +261,11 @@ steps:
     - /bin/bash -c "
       export CC=gcc-7 &&
       export CXX=g++-7 &&
-      source /opt/qt512/bin/qt512-env.sh &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      export QTDIR=$QT_BASE_DIR &&
+      export PATH=$QT_BASE_DIR/bin:$PATH &&
+      export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
       mkdir build &&
       cd build &&
       cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&
@@ -278,13 +286,17 @@ name: qt-5.12-clang
 
 steps:
 - name: build and test
-  image: nextcloudci/client-5.12:client-5.12-3
+  image: nextcloudci/client-5.12:client-5.12-5
   commands:
     # Install QtKeyChain
     - /bin/bash -c "
       export CC=clang-6.0 &&
       export CXX=clang++-6.0 &&
-      source /opt/qt512/bin/qt512-env.sh &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      export QTDIR=$QT_BASE_DIR &&
+      export PATH=$QT_BASE_DIR/bin:$PATH &&
+      export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
       cd /tmp &&
       git clone https://github.com/frankosterfeld/qtkeychain.git &&
       cd qtkeychain &&
@@ -298,7 +310,11 @@ steps:
     - /bin/bash -c "
       export CC=clang-6.0 &&
       export CXX=clang++-6.0 &&
-      source /opt/qt512/bin/qt512-env.sh &&
+      export QT_BASE_DIR=/opt/qt5.12.5 &&
+      export QTDIR=$QT_BASE_DIR &&
+      export PATH=$QT_BASE_DIR/bin:$PATH &&
+      export LD_LIBRARY_PATH=$QT_BASE_DIR/lib/x86_64-linux-gnu:$QT_BASE_DIR/lib:$LD_LIBRARY_PATH &&
+      export PKG_CONFIG_PATH=$QT_BASE_DIR/lib/pkgconfig:$PKG_CONFIG_PATH &&
       mkdir build &&
       cd build &&
       cmake -D NO_SHIBBOLETH=1 -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=1 -DSANITIZE_ADDRESS=ON ../ &&