From 57b216d6bcd8dc9e43f5fede167538f6d3951fd1 Mon Sep 17 00:00:00 2001 From: casey langen Date: Tue, 30 Apr 2019 22:07:18 -0700 Subject: [PATCH] Ubuntu Disco support! --- .circleci/config.yml | 16 +++++++++++++++- CMakeLists.txt | 2 +- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e7e846ebd..15b80bdd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -39,6 +39,19 @@ jobs: - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ - store_artifacts: path: /root/debs/ + build_ubuntu_disco: + docker: + - image: ubuntu:disco + steps: + - checkout + - run: apt-get update + - run: apt-get install -y build-essential clang cmake libboost-thread1.67-dev libboost-system1.67-dev libboost-filesystem1.67-dev libboost-date-time1.67-dev libboost-atomic1.67-dev libboost-chrono1.67-dev libogg-dev libvorbis-dev libavutil-dev libavformat-dev libswresample-dev libncursesw5-dev libasound2-dev libpulse-dev pulseaudio libmicrohttpd-dev libmp3lame-dev libcurl4-openssl-dev libev-dev libssl-dev libtag1-dev + - run: cmake -DGENERATE_DEB=1 -DDEB_ARCHITECTURE=amd64 -DDEB_DISTRO=disco -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release . + - run: make -j2 + - run: make package + - run: mkdir -p /root/debs && mv /root/project/*.deb /root/debs/ + - store_artifacts: + path: /root/debs/ build_ubuntu_zesty: docker: - image: ubuntu:zesty @@ -115,8 +128,9 @@ workflows: - build_ubuntu_artful: *workflow_filters - build_ubuntu_bionic: *workflow_filters - build_ubuntu_cosmic: *workflow_filters + - build_ubuntu_disco: *workflow_filters - build_ubuntu_zesty: *workflow_filters - build_fedora_26: *workflow_filters - build_fedora_27: *workflow_filters - build_fedora_28: *workflow_filters - - build_fedora_29: *workflow_filters \ No newline at end of file + - build_fedora_29: *workflow_filters diff --git a/CMakeLists.txt b/CMakeLists.txt index ebf5a2770..f8bb240e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,7 @@ if (GENERATE_DEB MATCHES "1") set(DEB_BOOST_VERSION "1.65.1") set(DEB_MICROHTTPD_VERSION "12") set(DEB_LIBCURL_VERSION "4") - elseif (DEB_DISTRO MATCHES "cosmic") + elseif (DEB_DISTRO MATCHES "cosmic" OR DEB_DISTRO MATCHES "disco") set(DEB_BOOST_VERSION "1.67.0") set(DEB_MICROHTTPD_VERSION "12") set(DEB_LIBCURL_VERSION "4")