Merge pull request #5911 from ethereum/cxx17-circleci

Build using C++17 on CircleCI
This commit is contained in:
Alex Beregszaszi 2019-02-05 15:48:43 +00:00 committed by GitHub
commit e696cc4d3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -66,6 +66,7 @@ jobs:
paths:
- soljson.js
- version.txt
test_emscripten_solcjs:
docker:
- image: circleci/node:10
@ -84,6 +85,7 @@ jobs:
name: Test solcjs
command: |
test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
test_emscripten_external:
docker:
- image: circleci/node:10
@ -102,6 +104,7 @@ jobs:
name: External tests
command: |
test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js
build_x86_linux:
docker:
- image: buildpack-deps:bionic
@ -124,6 +127,23 @@ jobs:
paths:
- "*"
build_x86_linux_cxx17:
docker:
- image: buildpack-deps:disco
environment:
TERM: xterm
CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/cxx17.cmake
steps:
- checkout
- run:
name: Install build dependencies
command: |
apt-get -qq update
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
build_x86_archlinux:
docker:
- image: archlinux/base
@ -345,6 +365,7 @@ workflows:
requires:
- build_emscripten
- build_x86_linux: *build_on_tags
- build_x86_linux_cxx17: *build_on_tags
- build_x86_clang7: *build_on_tags
- build_x86_mac: *build_on_tags
- test_x86_linux:

View File

@ -0,0 +1,4 @@
# Require C++17.
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF)