Skip to content

Upgrade CI to newer images and re-enable evmc-vmtester #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Upgrade CI to newer images and re-enable evmc-vmtester #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c26c4bf
ci: use cpp-build-env:14-lint
axic Jun 9, 2020
f351f28
ci: use cpp-build-env:14-gcc-9 and cpp-build-env:14-clang-10
axic Jun 9, 2020
76f3381
ci: use newer macOS
axic Jun 9, 2020
a51ba5a
f
axic Jun 9, 2020
4c6dad0
Revert "ci: Drop evmc-vmtester"
axic Jun 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ include(CableBuildType)
include(CableCompilerSettings)
include(CableToolchains)
include(CMakePackageConfigHelpers)
include(GNUInstallDirs)

include(Hunter/init)

Expand All @@ -23,6 +22,8 @@ set(CMAKE_DEBUG_POSTFIX "")
project(hera)
set(PROJECT_VERSION 0.3.0)

include(GNUInstallDirs)

cable_configure_compiler()
if(CABLE_COMPILER_GNULIKE)
# TODO: fix the warnings instead
Expand Down
24 changes: 11 additions & 13 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ defaults:
run:
name: "Run codespell"
command: |
sudo pip3 install --upgrade pip setuptools
sudo pip3 install codespell
codespell --skip=".git"

build: &build
Expand Down Expand Up @@ -197,9 +195,9 @@ jobs:
CC: clang
GENERATOR: Ninja
BUILD_PARALLEL_JOBS: 4
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TOOLS=ON
docker:
- image: ethereum/cpp-build-env:9
- image: ethereum/cpp-build-env:14-clang-10
steps:
- checkout
- *update-submodules
Expand All @@ -215,7 +213,7 @@ jobs:
- *test-binaryen
- *test-wabt
- *test-wavm
# - *evmc-test
- *evmc-test
- *evm2wasm-test

linux-clang-shared-asan:
Expand All @@ -225,11 +223,11 @@ jobs:
CC: clang
GENERATOR: Ninja
BUILD_PARALLEL_JOBS: 4
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DSANITIZE=address
CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON -DEVMC_TOOLS=ON -DSANITIZE=address
# The ASan must the first loaded shared library. Force preloading it with this flag.
PRELOAD_ASAN: true
docker:
- image: ethereum/cpp-build-env:9
- image: ethereum/cpp-build-env:14-clang-10
steps:
- checkout
- *update-submodules
Expand All @@ -244,7 +242,7 @@ jobs:
- *test-binaryen
- *test-wabt
- *test-wavm
# - *evmc-test
- *evmc-test
- *evm2wasm-test

linux-gcc-shared-coverage:
Expand All @@ -257,7 +255,7 @@ jobs:
- CMAKE_OPTIONS: -DCOVERAGE=ON -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON -DHERA_WABT=ON -DHERA_WAVM=ON
- TESTETH_OPTIONS: --evmc benchmark=true
docker:
- image: ethereum/cpp-build-env:9
- image: ethereum/cpp-build-env:14-gcc-9
steps:
- checkout
- *update-submodules
Expand All @@ -283,7 +281,7 @@ jobs:
- BUILD_PARALLEL_JOBS: 4
- CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=OFF -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON
docker:
- image: ethereum/cpp-build-env:9
- image: ethereum/cpp-build-env:14-gcc-9
steps:
- checkout
- *update-submodules
Expand All @@ -302,12 +300,12 @@ jobs:
- BUILD_PARALLEL_JOBS: 4
- CMAKE_OPTIONS: -DHERA_DEBUGGING=ON -DHERA_BINARYEN=ON -DHERA_WABT=ON
macos:
xcode: "10.1.0"
xcode: "11.5.0"
steps:
- run:
name: "Install system dependencies"
command: |
HOMEBREW_NO_AUTO_UPDATE=1 brew install -q cmake ninja leveldb
HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install cmake ninja leveldb
- checkout
- *update-submodules
- *environment-info
Expand All @@ -324,7 +322,7 @@ jobs:

lint:
docker:
- image: ethereum/cpp-build-env:9
- image: ethereum/cpp-build-env:14-lint
steps:
- checkout
- *codespell
Expand Down