From cee73d7598d250088d54681d93a39ff88a9b5a37 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Mon, 12 Jul 2021 00:49:58 +0200 Subject: [PATCH] Try to update qt in CI --- .gitlab-ci.yml | 12 +++++++----- AppImageBuilder.yml | 26 +++++++++----------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 67affd34..2b0777fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,13 +11,13 @@ build-gcc7: variables: CXX: g++-7 CC: gcc-7 - QT_PKG: 512 + QT_PKG: 515 TRAVIS_OS_NAME: linux before_script: - apt-get update - apt-get install -y software-properties-common - add-apt-repository ppa:ubuntu-toolchain-r/test -y - - add-apt-repository ppa:beineri/opt-qt-5.12.9-xenial -y + - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libgl1-mesa-dev libssl-dev git ccache # need recommended deps for wget - apt-get -y install wget @@ -157,22 +157,24 @@ appimage-amd64: stage: build image: appimagecrafters/appimage-builder tags: [docker] + variables: + QT_PKG: 515 before_script: # app build requirements - - echo 'deb http://archive.neon.kde.org/user/ bionic main' > /etc/apt/sources.list.d/neon.list - - wget -qO - https://archive.neon.kde.org/public.key | apt-key add - + - add-apt-repository ppa:beineri/opt-qt-5.15.2-xenial -y - apt-get update - apt-get install -y git wget curl # update appimage-builder (optional) - pip3 install --upgrade git+https://www.opencode.net/azubieta/appimagecraft.git - - apt-get install -y qt5-default qtdeclarative5-dev qttools5-dev qtscript5-dev qtquickcontrols2-5-dev qtmultimedia5-dev libqt5svg5-dev liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev + - apt-get update && apt-get -y install --no-install-recommends g++-7 build-essential ninja-build qt${QT_PKG}{base,declarative,tools,multimedia,script,quickcontrols2,svg} liblmdb-dev libssl-dev git ninja-build qt5keychain-dev libgtest-dev ccache libevent-dev libcurl4-openssl-dev - wget https://github.com/Kitware/CMake/releases/download/v3.19.0/cmake-3.19.0-Linux-x86_64.sh && sh cmake-3.19.0-Linux-x86_64.sh --skip-license --prefix=/usr/local - /usr/sbin/update-ccache-symlinks script: - export PATH="/usr/local/bin/:/usr/lib/ccache:${PATH}" - export CMAKE_BUILD_PARALLEL_LEVEL=$(cat /proc/cpuinfo | awk '/^processor/{print $3}' | wc -l) + - . "/opt/qt${QT_PKG}/bin/qt${QT_PKG}-env.sh" || true - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -GNinja -DHUNTER_ROOT=".hunter" -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF diff --git a/AppImageBuilder.yml b/AppImageBuilder.yml index f83ce90a..f4a6513c 100644 --- a/AppImageBuilder.yml +++ b/AppImageBuilder.yml @@ -27,7 +27,7 @@ AppDir: - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security main restricted - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security universe - sourceline: deb http://security.ubuntu.com/ubuntu bionic-security multiverse - - sourceline: deb http://archive.neon.kde.org/user/ bionic main + - sourceline: deb http://ppa.launchpad.net/beineri/opt-qt-5.15.2-bionic/ubuntu bionic main include: - gstreamer1.0-libav - gstreamer1.0-plugins-bad @@ -54,13 +54,13 @@ AppDir: - libopenexr22 - libpcre3 - libqt5keychain1 - - libqt5multimedia5-plugins - - libqt5multimediagsttools5 - - libqt5multimediawidgets5 - - libqt5quickcontrols2-5 - - libqt5quicktemplates2-5 - - libqt5quickwidgets5 - - libqt5svg5 + - qt515base + - qt515declarative + - qt515tools + - qt515multimedia + - qt515script + - qt515quickcontrols2 + - qt515svg - librubberband2 - libsensors4 - libsm6 @@ -82,15 +82,7 @@ AppDir: - libxv1 - libxxf86vm1 - libzstd1 - - qml-module-qt-labs-platform - - qml-module-qtgraphicaleffects - - qml-module-qtmultimedia - - qml-module-qtquick-controls2 - - qml-module-qtquick-layouts - - qml-module-qtquick-templates2 - - qml-module-qtquick-window2 - - qml-module-qtquick2 - - qt5-image-formats-plugins + - qt515imageformats exclude: [] files: exclude: