Merge pull request #449 from nextcloud/ci/appimage

Build AppImage with Qt-5.11
This commit is contained in:
Roeland Jago Douma 2018-06-26 21:18:30 +02:00 committed by GitHub
commit aa04f20ad6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View file

@ -80,7 +80,7 @@ pipeline:
matrix:
TESTS: qt-5.9
qt-5.10:
image: nextcloudci/client-5.10:client-5.10-2
image: nextcloudci/client-5.10:client-5.10-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -109,7 +109,7 @@ pipeline:
matrix:
TESTS: qt-5.10
qt-5.11:
image: nextcloudci/client-5.11:client-5.11-2
image: nextcloudci/client-5.11:client-5.11-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -139,7 +139,7 @@ pipeline:
TESTS: qt-5.11
qt-5.11-clang:
image: nextcloudci/client-5.11:client-5.11-2
image: nextcloudci/client-5.11:client-5.11-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -168,8 +168,8 @@ pipeline:
matrix:
TESTS: qt-5.11-clang
AppImage-5.9:
image: nextcloudci/client-appimage-ci:client-appimage-ci-15
AppImage:
image: nextcloudci/client-5.11:client-5.11-3
commands:
- /bin/bash -c "./admin/linux/build-appimage.sh"
when:

View file

@ -5,8 +5,8 @@ set -xe
mkdir /app
mkdir /build
#Set Qt-5.9
export QT_BASE_DIR=/opt/qt59
#Set Qt-5.11
export QT_BASE_DIR=/opt/qt511
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