Merge pull request #442 from nextcloud/fix/noid/appimage_webview

Fix webview appimage
This commit is contained in:
Roeland Jago Douma 2018-06-23 21:36:47 +02:00 committed by GitHub
commit 1235652cde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions

View file

@ -5,7 +5,7 @@ clone:
pipeline:
qt-5.7:
image: nextcloudci/client-5.7:client-5.7-2
image: nextcloudci/client-5.7:client-5.7-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -30,7 +30,7 @@ pipeline:
matrix:
TESTS: qt-5.7
qt-5.8:
image: nextcloudci/client-5.8:client-5.8-2
image: nextcloudci/client-5.8:client-5.8-3
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -55,7 +55,7 @@ pipeline:
matrix:
TESTS: qt-5.8
qt-5.9:
image: nextcloudci/client-5.9:client-5.9-3
image: nextcloudci/client-5.9:client-5.9-4
commands:
# Install QtKeyChain
- /bin/bash -c "
@ -80,7 +80,7 @@ pipeline:
matrix:
TESTS: qt-5.9
AppImage-5.9:
image: nextcloudci/client-appimage-ci:client-appimage-ci-9
image: nextcloudci/client-appimage-ci:client-appimage-ci-15
commands:
- /bin/bash -c "./admin/linux/build-appimage.sh"
when:

View file

@ -71,8 +71,11 @@ cp ./usr/share/icons/hicolor/512x512/apps/Nextcloud.png . # Workaround for linux
# Because distros need to get their shit together
cp -P /lib/x86_64-linux-gnu/libssl.so* ./usr/lib/
cp -P /lib/x86_64-linux-gnu/libcrypto.so* ./usr/lib/
cp -P /usr/local/lib/libssl.so* ./usr/lib/
cp -P /usr/local/lib/libcrypto.so* ./usr/lib/
# NSS fun
cp -P -r /usr/lib/x86_64-linux-gnu/nss ./usr/lib/
# Use linuxdeployqt to deploy
cd /build