From f3a8495b08218459faa72bad5ea8c38975e3d223 Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 3 Sep 2019 20:53:38 +0200 Subject: [PATCH] CI: Don't test g++-5 anymore. ubuntu-toolchain-r doesn't provide builds of g++ < 8 for Ubuntu 18.04. --- .drone.yml | 15 ++++----------- README.adoc | 7 +++---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9e90761..2774f3f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,29 +13,22 @@ trigger: - tag steps: -- name: gcc5 +- name: gcc8 image: debian:buster-slim pull: always environment: - CXX: g++-5 + CXX: g++-8 CXXFLAGS: -pipe -O2 LANG: en_US.utf-8 commands: - rm /etc/apt/apt.conf.d/docker-clean - alias apt-get='rm -f /var/cache/apt/archives/lock && apt-get' - apt-get update -q - - echo "APT::Default-Release \"buster\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main" >> /etc/apt/sources.list.d/ubuntu-toolchain-r.list - - apt-get install -qy gnupg - - gpg --keyserver hkp://keyserver.ubuntu.com --recv-keys 0x60c317803a41ba51845e371a1e9377a2ba9ef27f - - gpg --armor --export 0x60c317803a41ba51845e371a1e9377a2ba9ef27f | apt-key add - - - apt-get update -q - - apt-get install -qy -t bionic g++-5 - - apt-get install -qy cmake pkg-config libpoco-dev libxdg-basedir-dev asciidoc catch + - apt-get install -qy g++ cmake pkg-config libpoco-dev libxdg-basedir-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_MOZILLA=YES -DWITH_TESTS=YES .. - make VERBOSE=1 - - maker install DESTDIR=install + - make install DESTDIR=install - cd tests && ctest -V volumes: - name: debian-package-cache diff --git a/README.adoc b/README.adoc index 515308b..c2e419b 100644 --- a/README.adoc +++ b/README.adoc @@ -54,7 +54,7 @@ only. ==== Dependencies * Tested OS: Linux -* C++ compiler (tested: https://gcc.gnu.org/[gcc] 5/8/9, +* C++ compiler (tested: https://gcc.gnu.org/[gcc] 8/9, https://llvm.org/[clang] 6/7) * https://cmake.org/[cmake] (at least: 3.2) * https://pkgconfig.freedesktop.org/wiki/[pkgconfig] (tested: 0.29) @@ -66,12 +66,11 @@ only. ** DEB package: https://packages.qa.debian.org/dpkg[dpkg] (tested: 1.18) ** RPM package: http://www.rpm.org[rpm-build] (tested: 4.11) -.Install dependencies in Debian stretch. +.Install dependencies in Debian buster. ==== [source,zsh] ---- -apt-get install g++-6 cmake pkg-config libpoco-dev libxdg-basedir-dev asciidoc dpkg -export CXX="g++-6" +apt-get install g++ cmake pkg-config libpoco-dev libxdg-basedir-dev asciidoc dpkg ---- ====