From c26c4bfd280d57a767e9ed384560640d23e34b20 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 9 Jun 2020 13:22:47 +0100
Subject: [PATCH 1/5] ci: use cpp-build-env:14-lint

---
 circle.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index bd1999205..440021e90 100644
--- a/circle.yml
+++ b/circle.yml
@@ -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
@@ -324,7 +322,7 @@ jobs:
 
   lint:
     docker:
-      - image: ethereum/cpp-build-env:9
+      - image: ethereum/cpp-build-env:14-lint
     steps:
       - checkout
       - *codespell

From f351f2883ce4c420331d93472e986d7c093de278 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 9 Jun 2020 13:24:45 +0100
Subject: [PATCH 2/5] ci: use cpp-build-env:14-gcc-9 and
 cpp-build-env:14-clang-10

---
 circle.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 440021e90..08a8ce78c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -197,7 +197,7 @@ jobs:
       BUILD_PARALLEL_JOBS: 4
       CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=ON -DHERA_DEBUGGING=OFF -DHERA_BINARYEN=ON -DHERA_WAVM=ON -DHERA_WABT=ON
     docker:
-      - image: ethereum/cpp-build-env:9
+      - image: ethereum/cpp-build-env:14-clang-10
     steps:
       - checkout
       - *update-submodules
@@ -227,7 +227,7 @@ jobs:
       # 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
@@ -255,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
@@ -281,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

From 76f3381061a8d6e0d92f695916d3421314662e8a Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 9 Jun 2020 13:48:36 +0100
Subject: [PATCH 3/5] ci: use newer macOS

---
 circle.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 08a8ce78c..5c0ff4984 100644
--- a/circle.yml
+++ b/circle.yml
@@ -300,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

From a51ba5a1281ec46b6c069c9cbec1a076fea30a90 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 9 Jun 2020 14:22:58 +0100
Subject: [PATCH 4/5] f

---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79b7f6152..9d48e77b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,6 @@ include(CableBuildType)
 include(CableCompilerSettings)
 include(CableToolchains)
 include(CMakePackageConfigHelpers)
-include(GNUInstallDirs)
 
 include(Hunter/init)
 
@@ -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

From 4c6dad0fb60a30ac9a132fc2cb2ab6db426d73a7 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 9 Jun 2020 14:50:11 +0100
Subject: [PATCH 5/5] Revert "ci: Drop evmc-vmtester"

This reverts commit 38a0db37b4d705dd8f3197c5bd5ce14f796e0b5e.
---
 circle.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index 5c0ff4984..b086bebfd 100644
--- a/circle.yml
+++ b/circle.yml
@@ -195,7 +195,7 @@ 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:14-clang-10
     steps:
@@ -213,7 +213,7 @@ jobs:
       - *test-binaryen
       - *test-wabt
       - *test-wavm
-#      - *evmc-test
+      - *evmc-test
       - *evm2wasm-test
 
   linux-clang-shared-asan:
@@ -223,7 +223,7 @@ 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:
@@ -242,7 +242,7 @@ jobs:
       - *test-binaryen
       - *test-wabt
       - *test-wavm
-#      - *evmc-test
+      - *evmc-test
       - *evm2wasm-test
 
   linux-gcc-shared-coverage: