From 54492ff97904d9b73ab9fdca9735841be8610d0f Mon Sep 17 00:00:00 2001 From: tastytea Date: Mon, 5 Aug 2019 09:03:38 +0200 Subject: [PATCH] CI: changed cmake-6 on stretch to clang-7 on buster. --- .drone.yml | 13 +++++-------- README.adoc | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index c49a452..cd3c1eb 100644 --- a/.drone.yml +++ b/.drone.yml @@ -116,22 +116,19 @@ steps: - name: debian-package-cache path: /var/cache/apt/archives -- name: clang6 - image: debian:stretch-slim +- name: clang7 + image: debian:buster-slim pull: always environment: - CXX: clang++-6.0 + CXX: clang++ 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' - - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://deb.debian.org/debian stretch-backports main" >> /etc/apt/sources.list.d/stretch.list - apt-get update -q - - apt-get install -qy -t stretch-backports clang-6.0 - - apt-get install -qy -t stretch cmake pkg-config - - apt-get install -qy -t stretch libpoco-dev libxdg-basedir-dev libvsqlitepp-dev libboost-system-dev libboost-filesystem-dev libicu-dev asciidoc catch + - apt-get install -qy clang cmake pkg-config + - apt-get install -qy libpoco-dev libxdg-basedir-dev libvsqlitepp-dev libboost-system-dev libboost-filesystem-dev libicu-dev asciidoc catch - rm -rf build && mkdir -p build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES .. - make VERBOSE=1 diff --git a/README.adoc b/README.adoc index b7ec7e2..7c3e60a 100644 --- a/README.adoc +++ b/README.adoc @@ -55,7 +55,7 @@ only. * Tested OS: Linux * C++ compiler (tested: https://gcc.gnu.org/[gcc] 5/6/8/9, - https://llvm.org/[clang] 3/6) + https://llvm.org/[clang] 3/7) * https://cmake.org/[cmake] (at least: 3.2) * https://pkgconfig.freedesktop.org/wiki/[pkgconfig] (tested: 0.29) * https://github.com/badaix/popl[popl] (tested: 1.2)