From e89945e9db4247f6a9342fec651473d78e612f4c Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Tue, 11 Apr 2023 02:01:55 +0200 Subject: [PATCH] Drop gcc10 support --- .gitlab-ci.yml | 41 ----------------------------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 42 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6b4bbc72..50433733 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -82,47 +82,6 @@ build-gcc11: - .hunter/ - .ccache -build-gcc10: - stage: build - image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/debian:bullseye - tags: [docker] - variables: - TRAVIS_OS_NAME: linux - before_script: - - echo -e "\e[0Ksection_start:`date +%s`:install_deps[collapsed=true]\r\e[0K\e[1m\e[95mInstalling apt dependencies" - - apt-get update - - apt-get -y install --no-install-suggests --no-install-recommends ca-certificates build-essential ninja-build cmake gcc make automake ccache liblmdb-dev - libssl-dev libqt5multimedia5-plugins libqt5multimediagsttools5 libqt5multimediaquick5 libqt5svg5-dev - qtmultimedia5-dev qtquickcontrols2-5-dev qttools5-dev qttools5-dev-tools qtdeclarative5-dev - qml-module-qtmultimedia qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qt-labs-platform - qt5keychain-dev ccache clazy libcurl4-openssl-dev libevent-dev libspdlog-dev git nlohmann-json3-dev libcmark-dev asciidoc # libolm-dev - # need recommended deps for wget - - apt-get -y install wget - - /usr/sbin/update-ccache-symlinks - - rm -rf ../.hunter && mv .hunter ../.hunter || true - - echo -e "\e[0Ksection_end:`date +%s`:install_deps\r\e[0K" - script: - - export PATH="/usr/lib/ccache:${PATH}" - - cmake -GNinja -H. -Bbuild - -DCMAKE_INSTALL_PREFIX=.deps/usr - -DHUNTER_ROOT="../.hunter" - -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF -DUSE_BUNDLED_OPENSSL=ON -DUSE_BUNDLED_LMDB=OFF -DUSE_BUNDLED_QTKEYCHAIN=OFF - -DVOIP=OFF - -DCMAKE_BUILD_TYPE=Release -DHUNTER_CONFIGURATION_TYPES=Release - -DCI_BUILD=ON -DFETCHCONTENT_QUIET=OFF - -DJSON_ImplicitConversions=OFF - -DMAN=OFF - - cmake --build build - after_script: - - mv ../.hunter .hunter - rules: - - if : '$CI_PIPELINE_TRIGGERED == null' - cache: - key: "$CI_JOB_NAME" - paths: - - .hunter/ - - .ccache - build-tw: stage: build image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/opensuse/tumbleweed diff --git a/README.md b/README.md index 0463599a..18eea4bf 100644 --- a/README.md +++ b/README.md @@ -253,7 +253,7 @@ KDE has similar plugins, that can extend the supported image types even more. - [qtkeychain](https://github.com/frankosterfeld/qtkeychain) (You need at least version 0.12 for proper Gnome Keychain support. The bundled version requires libsecret, unless you pass `-DLIBSECRET_SUPPORT=OFF`.) - A compiler that supports C++ 20: - Clang 11 (Only clazy 13 is tested in CI) - - GCC 10 (tested on Gitlab CI) + - GCC 11 (tested on Gitlab CI) - MSVC 19.13 (tested on AppVeyor) Nheko can use bundled version for most of those libraries automatically, if the versions in your distro are too old.