mirror of
https://github.com/ethereum/solidity
synced 2023-10-03 13:03:40 +00:00
Merge pull request #5911 from ethereum/cxx17-circleci
Build using C++17 on CircleCI
This commit is contained in:
commit
e696cc4d3b
@ -66,6 +66,7 @@ jobs:
|
|||||||
paths:
|
paths:
|
||||||
- soljson.js
|
- soljson.js
|
||||||
- version.txt
|
- version.txt
|
||||||
|
|
||||||
test_emscripten_solcjs:
|
test_emscripten_solcjs:
|
||||||
docker:
|
docker:
|
||||||
- image: circleci/node:10
|
- image: circleci/node:10
|
||||||
@ -84,6 +85,7 @@ jobs:
|
|||||||
name: Test solcjs
|
name: Test solcjs
|
||||||
command: |
|
command: |
|
||||||
test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
|
test/solcjsTests.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
|
||||||
|
|
||||||
test_emscripten_external:
|
test_emscripten_external:
|
||||||
docker:
|
docker:
|
||||||
- image: circleci/node:10
|
- image: circleci/node:10
|
||||||
@ -102,6 +104,7 @@ jobs:
|
|||||||
name: External tests
|
name: External tests
|
||||||
command: |
|
command: |
|
||||||
test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js
|
test/externalTests.sh /tmp/workspace/soljson.js || test/externalTests.sh /tmp/workspace/soljson.js
|
||||||
|
|
||||||
build_x86_linux:
|
build_x86_linux:
|
||||||
docker:
|
docker:
|
||||||
- image: buildpack-deps:bionic
|
- image: buildpack-deps:bionic
|
||||||
@ -124,6 +127,23 @@ jobs:
|
|||||||
paths:
|
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:
|
build_x86_archlinux:
|
||||||
docker:
|
docker:
|
||||||
- image: archlinux/base
|
- image: archlinux/base
|
||||||
@ -345,6 +365,7 @@ workflows:
|
|||||||
requires:
|
requires:
|
||||||
- build_emscripten
|
- build_emscripten
|
||||||
- build_x86_linux: *build_on_tags
|
- build_x86_linux: *build_on_tags
|
||||||
|
- build_x86_linux_cxx17: *build_on_tags
|
||||||
- build_x86_clang7: *build_on_tags
|
- build_x86_clang7: *build_on_tags
|
||||||
- build_x86_mac: *build_on_tags
|
- build_x86_mac: *build_on_tags
|
||||||
- test_x86_linux:
|
- test_x86_linux:
|
||||||
|
4
cmake/toolchains/cxx17.cmake
Normal file
4
cmake/toolchains/cxx17.cmake
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
# Require C++17.
|
||||||
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
|
||||||
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
Loading…
Reference in New Issue
Block a user