diff --git a/.drone.yml b/.drone.yml index b0ca7c3..e633d86 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,6 +1,6 @@ pipeline: gcc6: - image: debian:jessie-slim + image: ubuntu:xenial pull: true environment: - LANG=C.utf8 @@ -8,15 +8,14 @@ pipeline: - CXXFLAGS=-pipe -O2 commands: - rm /etc/apt/apt.conf.d/docker-clean - - echo "APT::Default-Release \"jessie\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://deb.debian.org/debian jessie-backports main" >> /etc/apt/sources.list.d/backports.list - - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list + - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list + # - echo "deb http://ppa.launchpad.net/george-edison55/cmake-3.x/ubuntu xenial main" >> /etc/apt/sources.list.d/cmake-3.x.list - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f + # - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0xb118cd3c377df930edd06c67084ecfc5828ab726 - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add - + # - gpg --armor --export 0xb118cd3c377df930edd06c67084ecfc5828ab726 | apt-key add - - apt-get update -q - - apt-get install -qy -t trusty g++-6 - - apt-get install -qy g++ pkg-config - - apt-get install -qy -t jessie-backports cmake + - apt-get install -qy g++-6 cmake pkg-config - apt-get install -qy libvsqlitepp-dev libboost-dev libxdg-basedir-dev qt5-default qttools5-dev-tools qttools5-dev libconfig++-dev - apt-get install -qy dpkg-dev rpm file wget - gpg --import /var/autosign_gpg.key @@ -166,7 +165,7 @@ pipeline: - /var/cache/debian-package-cache:/var/cache/apt/archives prepare_release: - image: debian:jessie-slim + image: ubuntu:xenial pull: true when: event: tag diff --git a/CMakeLists.txt b/CMakeLists.txt index 37b3ced..b1ee387 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.6) +cmake_minimum_required (VERSION 3.2) project (whyblocked VERSION 0.12.1 LANGUAGES CXX diff --git a/README.md b/README.md index 6882c51..c47c6ea 100644 --- a/README.md +++ b/README.md @@ -31,14 +31,14 @@ Gentoo ebuilds are available via my * C++ compiler (tested: [gcc](https://gcc.gnu.org/) 6/7/8, [clang](https://llvm.org/) 3/5/6) -* [cmake](https://cmake.org/) (at least 3.6) -* [vsqlite++](http://vsqlite.virtuosic-bytes.com/) (tested: 0.3.13) +* [cmake](https://cmake.org/) (at least 3.2) +* [vsqlite++](http://vsqlite.virtuosic-bytes.com/) (tested: 0.3) * [libxdg-basedir](http://repo.or.cz/w/libxdg-basedir.git) (tested: 1.2) -* [qtcore](https://www.qt.io/) (tested: 5.11/5.7) +* [qtcore](https://www.qt.io/) (tested: 5.11/5.2) * Optional - * GUI: [qtwidgets](https://www.qt.io/) (tested: 5.11/5.7) - * GUI: [libconfig++](https://github.com/hyperrealm/libconfig) (tested: 1.5) - * Translations: [lupdate & lrelease](http://doc.qt.io/qt-5/linguist-manager.html) (tested: 5.11/5.7) + * GUI: [qtwidgets](https://www.qt.io/) (tested: 5.11/5.2) + * GUI: [libconfig++](https://github.com/hyperrealm/libconfig) (tested: 1.5 / 1.4) + * Translations: [lupdate & lrelease](http://doc.qt.io/qt-5/linguist-manager.html) (tested: 5.11/5.2) #### Get sourcecode