From a6f70263b872382f7ea77b89414cc1337b5719e4 Mon Sep 17 00:00:00 2001 From: tastytea Date: Wed, 21 Aug 2019 04:36:04 +0200 Subject: [PATCH] Remove curlpp from drone recipe. --- .drone.yml | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1427b3c..4088fa6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -27,12 +27,9 @@ steps: commands: - rm /etc/apt/apt.conf.d/docker-clean - rm /var/cache/apt/archives/lock - - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list - apt-get update -q - - apt-get install -qy build-essential cmake pkg-config - - apt-get install -qy libcurl4-openssl-dev libpoco-dev libjsoncpp-dev doxygen catch - - apt-get install -qy -t sid libcurlpp-dev + - apt-get install -qy build-essential cmake + - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_EXAMPLES=YES -DWITH_TESTS=YES -DEXTRA_TEST_ARGS="~[api]" .. - make VERBOSE=1 @@ -55,16 +52,14 @@ steps: - rm /var/cache/apt/archives/lock - apt-get update -q - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu xenial 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 build-essential cmake pkg-config + - apt-get install -qy build-essential cmake - apt-get install -qy -t xenial g++-9 - - apt-get install -qy libcurl4-openssl-dev libpoco-dev libjsoncpp-dev doxygen catch - - apt-get install -qy -t sid libcurlpp-dev + - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_EXAMPLES=YES .. - make VERBOSE=1 @@ -87,12 +82,10 @@ steps: - apt-get update -q - 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 - - echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list - apt-get update -q - - apt-get install -qy build-essential cmake pkg-config + - apt-get install -qy build-essential cmake - apt-get install -qy -t stretch-backports clang-5.0 - - apt-get install -qy libcurl4-openssl-dev libpoco-dev libjsoncpp-dev doxygen catch - - apt-get install -qy -t sid libcurlpp-dev + - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_EXAMPLES=YES .. - make VERBOSE=1 @@ -116,12 +109,10 @@ steps: - apt-get update -q - 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 - - echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list - apt-get update -q - - apt-get install -qy build-essential cmake pkg-config + - apt-get install -qy build-essential cmake - apt-get install -qy -t stretch-backports clang-6.0 - - apt-get install -qy libcurl4-openssl-dev libpoco-dev libjsoncpp-dev doxygen catch - - apt-get install -qy -t sid libcurlpp-dev + - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen catch - rm -rf build && mkdir -p build && cd build - cmake -DWITH_EXAMPLES=YES .. - make VERBOSE=1 @@ -173,13 +164,9 @@ steps: commands: - rm /etc/apt/apt.conf.d/docker-clean - rm /var/cache/apt/archives/lock - - echo "APT::Default-Release \"stretch\";" >> /etc/apt/apt.conf.d/00default_release - - echo "deb http://deb.debian.org/debian sid main" >> /etc/apt/sources.list.d/sid.list - apt-get update -q - - apt-get install -qy build-essential cmake pkg-config - - apt-get install -qy libcurl4-openssl-dev libpoco-dev libjsoncpp-dev doxygen - - apt-get install -qy -t sid libcurlpp-dev - - apt-get install -qy file + - apt-get install -qy build-essential cmake + - apt-get install -qy libpoco-dev libjsoncpp-dev doxygen file - rm -rf build && mkdir -p build && cd build - cmake -DWITH_EXAMPLES=NO -DWITH_TESTS=NO .. - make package @@ -206,9 +193,6 @@ steps: - scl enable devtoolset-6 bash - yum install -qy libcurl-devel poco-devel doxygen rpm-build - yum --enablerepo=epel install -qy cmake3 jsoncpp-devel - - curl -s -o /var/cache/yum/curlpp-devel-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-devel-0.7.3-5.el6.x86_64.rpm - - curl -s -o /var/cache/yum/curlpp-0.7.3-5.el6.x86_64.rpm https://download.fedoraproject.org/pub/epel/6/x86_64/Packages/c/curlpp-0.7.3-5.el6.x86_64.rpm - - yum localinstall -qy /var/cache/yum/curlpp-* - rm -rf build && mkdir -p build && cd build - cmake3 -DWITH_EXAMPLES=NO -DWITH_TESTS=NO .. - make package