diff options
author | Michael Schuster <michael@schuster.ms> | 2020-07-22 04:28:06 +0300 |
---|---|---|
committer | Michael Schuster <michael@schuster.ms> | 2020-07-22 15:19:57 +0300 |
commit | 6cc1aa723e45be73d2cd64cda7363f4edb6b0e6d (patch) | |
tree | 0e5c88dbe8aca86a38db7a9a64c9033fd40d5a97 /.drone.yml | |
parent | ccff6e00dc0dc14079d62440c3efb399232b7585 (diff) |
Update CI for Qt 5.12.9
Also remove the jq package installation from the AppImage build script because
the package is included in the new Docker image (see nextcloud/docker-ci#231).
Signed-off-by: Michael Schuster <michael@schuster.ms>
Diffstat (limited to '.drone.yml')
-rw-r--r-- | .drone.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/.drone.yml b/.drone.yml index fbb311e52..e7c43bb1e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,13 +3,13 @@ name: qt-5.12 steps: - name: build and test - image: nextcloudci/client-5.12:client-5.12-7 + image: nextcloudci/client-5.12:client-5.12-9 commands: # Install QtKeyChain - /bin/bash -c " export CC=gcc-7 && export CXX=g++-7 && - export QT_BASE_DIR=/opt/qt5.12.8 && + export QT_BASE_DIR=/opt/qt5.12.9 && 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:/usr/local/lib:\$LD_LIBRARY_PATH && @@ -27,7 +27,7 @@ steps: - /bin/bash -c " export CC=gcc-7 && export CXX=g++-7 && - export QT_BASE_DIR=/opt/qt5.12.8 && + export QT_BASE_DIR=/opt/qt5.12.9 && 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:/usr/local/lib:\$LD_LIBRARY_PATH && @@ -52,13 +52,13 @@ name: qt-5.12-clang steps: - name: build and test - image: nextcloudci/client-5.12:client-5.12-7 + image: nextcloudci/client-5.12:client-5.12-9 commands: # Install QtKeyChain - /bin/bash -c " export CC=clang-6.0 && export CXX=clang++-6.0 && - export QT_BASE_DIR=/opt/qt5.12.8 && + export QT_BASE_DIR=/opt/qt5.12.9 && 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:/usr/local/lib:\$LD_LIBRARY_PATH && @@ -76,7 +76,7 @@ steps: - /bin/bash -c " export CC=clang-6.0 && export CXX=clang++-6.0 && - export QT_BASE_DIR=/opt/qt5.12.8 && + export QT_BASE_DIR=/opt/qt5.12.9 && 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:/usr/local/lib:\$LD_LIBRARY_PATH && @@ -103,7 +103,7 @@ name: AppImage steps: - name: build - image: nextcloudci/client-5.12:client-5.12-7 + image: nextcloudci/client-5.12:client-5.12-9 environment: CI_UPLOAD_GIT_TOKEN: from_secret: CI_UPLOAD_GIT_TOKEN |