From: Michael Schuster <michael@schuster.ms>
Date: Sat, 16 Nov 2019 20:31:07 +0000 (+0100)
Subject: Upgrade for Qt 5.12.5 in docker-ci
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~222^2^2~541^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d830a1c5f73e6804434b1c0d7aab1c5f5ba1ddd9;p=nextcloud-desktop.git

Upgrade for Qt 5.12.5 in docker-ci

- Use the new image: nextcloudci/client-5.12:client-5.12-5
- Use it's new QT_BASE_DIR: /opt/qt5.12.5

Signed-off-by: Michael Schuster <michael@schuster.ms>
---

diff --git a/.drone.yml b/.drone.yml
index 3df15e5f6..b00420981 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -319,7 +319,7 @@ name: AppImage
 
 steps:
 - name: build
-  image: nextcloudci/client-5.12:client-5.12-3
+  image: nextcloudci/client-5.12:client-5.12-5
   commands:
     - /bin/bash -c "./admin/linux/build-appimage.sh"
 trigger:
diff --git a/admin/linux/build-appimage.sh b/admin/linux/build-appimage.sh
index f34519c05..3c5b26c97 100755
--- a/admin/linux/build-appimage.sh
+++ b/admin/linux/build-appimage.sh
@@ -6,7 +6,7 @@ mkdir /app
 mkdir /build
 
 #Set Qt-5.12
-export QT_BASE_DIR=/opt/qt512
+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