From f56ab1c2e76cc12dd00417219c1589d044c08ebf Mon Sep 17 00:00:00 2001 From: Daniel Kirchner Date: Mon, 4 Feb 2019 14:10:27 +0100 Subject: [PATCH] Enable cvc4 for C++17 build by switching to Ubuntu disco. --- .circleci/config.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ff111c6a..8b36a05ee 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -129,7 +129,7 @@ jobs: build_x86_linux_cxx17: docker: - - image: buildpack-deps:bionic + - image: buildpack-deps:disco environment: TERM: xterm CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/cxx17.cmake @@ -139,8 +139,7 @@ jobs: name: Install build dependencies command: | apt-get -qq update - # Note: do not include cvc4 here, it is not C++17 compatible. - apt-get -qy install cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev + apt-get -qy install cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev libcvc4-dev ./scripts/install_obsolete_jsoncpp_1_7_4.sh - run: *setup_prerelease_commit_hash - run: *run_build