diff options
| author | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-08 23:37:24 +0300 |
|---|---|---|
| committer | Konstantinos Sideris <sideris.konstantin@gmail.com> | 2018-09-08 23:37:24 +0300 |
| commit | c347c0d5f5997857e211e8a254be2efbb61c2404 (patch) | |
| tree | 8a031ae8e8618f8dea628609fedd6c7e9f77dda3 /.ci | |
| parent | 72333aec59b5e85c3194277fa29d5123a4b40694 (diff) | |
Fix the docker build
fixes #334
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/install.sh | 4 | ||||
| -rwxr-xr-x | .ci/linux/deploy.sh | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.ci/install.sh b/.ci/install.sh index f49db9b8..ed25fcf2 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -24,8 +24,8 @@ if [ $TRAVIS_OS_NAME == linux ]; then QT_PKG="59" fi - wget https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh - sudo sh cmake-3.11.4-Linux-x86_64.sh --skip-license --prefix=/usr/local + wget https://cmake.org/files/v3.12/cmake-3.12.2-Linux-x86_64.sh + sudo sh cmake-3.12.2-Linux-x86_64.sh --skip-license --prefix=/usr/local sudo add-apt-repository -y ppa:chris-lea/libsodium sudo add-apt-repository -y ppa:beineri/opt-qt${QT_VERSION}-trusty diff --git a/.ci/linux/deploy.sh b/.ci/linux/deploy.sh index 5859fc4a..4e716003 100755 --- a/.ci/linux/deploy.sh +++ b/.ci/linux/deploy.sh @@ -31,10 +31,7 @@ unset QT_PLUGIN_PATH unset LD_LIBRARY_PATH export ARCH=$(uname -m) - -if [ ! -z $TRAVIS_TAG ]; then - export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH -fi +export LD_LIBRARY_PATH=.deps/usr/lib/:$LD_LIBRARY_PATH ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -bundle-non-qt-libs ./linuxdeployqt*.AppImage ${DIR}/usr/share/applications/*.desktop -appimage |