Merge pull request #619 from ethereum/ci

cmake, ci: Upgrade dependencies and compilers
ethereum · Dec 27, 2021 · 04ce443 · 04ce443
2 parents 9f9d4d8 + 8e6d62f
commit 04ce443
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 27 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -42,22 +42,22 @@ search = github.com/ethereum/evmc/v{current_version}
 replace = github.com/ethereum/evmc/v{new_version}
 
 [bumpversion:file:bindings/rust/evmc-sys/Cargo.toml]
-search = version = \"{current_version}\"
+search = version = "{current_version}"
 
 [bumpversion:file:bindings/rust/evmc-vm/Cargo.toml]
-search = version = \"{current_version}\"
+search = version = "{current_version}"
 
 [bumpversion:file:bindings/rust/evmc-declare/Cargo.toml]
-search = version = \"{current_version}\"
+search = version = "{current_version}"
 
 [bumpversion:file:bindings/rust/evmc-declare-tests/Cargo.toml]
-search = version = \"{current_version}\"
+search = version = "{current_version}"
 
 [bumpversion:file:examples/example-rust-vm/Cargo.toml]
-search = version = \"{current_version}\"
+search = version = "{current_version}"
 
 [bumpversion:file:examples/example-rust-vm/src/lib.rs]
-search = , \"{current_version}\"
+search = , "{current_version}"
 
 [bumpversion:file:docs/EVMC.md]
 serialize = {major}

diff --git a/.codespell-whitelist b/.codespell-whitelist
@@ -1,2 +1,3 @@
 iff
 mut
+crate
diff --git a/appveyor.yml b/appveyor.yml
@@ -10,6 +10,8 @@ configuration:
   - Release
 environment:
   matrix:
+    - VS: 2022
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022
     - VS: 2019
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
     - VS: 2017
@@ -19,6 +21,7 @@ cache:
   - C:\.hunter\_Base\Cache -> cmake\Hunter\init.cmake
 
 before_build:
+  - if "%VS%" == "2022" (call "%ProgramFiles%\Microsoft Visual Studio\2022\Community\Common7\Tools\vsdevcmd" -arch=amd64)
   - if "%VS%" == "2019" (call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\Common7\Tools\vsdevcmd" -arch=amd64)
   - if "%VS%" == "2017" (call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd" -arch=amd64)
   - if "%VS%" == "2017-32bit" (call "%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\Common7\Tools\vsdevcmd" -arch=x86)

diff --git a/circle.yml b/circle.yml
@@ -3,10 +3,10 @@ version: 2.1
 executors:
   linux-gcc-latest:
     docker:
-      - image: ethereum/cpp-build-env:16-gcc-10
+      - image: ethereum/cpp-build-env:17-gcc-11
   linux-clang-latest:
     docker:
-      - image: ethereum/cpp-build-env:16-clang-11
+      - image: ethereum/cpp-build-env:17-clang-13
 
 
 commands:
@@ -100,8 +100,6 @@ jobs:
     - run:
         name: "Check bumpversion"
         command: |
-          export PATH="/home/builder/.local/bin:$PATH"
-          pip3 install bumpversion
           bumpversion --dry-run --verbose major
           bumpversion --dry-run --verbose minor
           bumpversion --dry-run --verbose patch

diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake
@@ -1,19 +1,9 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018-2019 The EVMC Authors.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the Apache License, Version 2.0.
 
 # Local Hunter configuration.
 
-set(gtest_cxx_flags "${CMAKE_CXX_FLAGS_INIT} -DGTEST_HAS_TR1_TUPLE=0")
-
-hunter_config(
-    GTest
-    VERSION 1.8.1
-    URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz
-    SHA1 152b849610d91a9dfa1401293f43230c2e0c33f8
-    CMAKE_ARGS BUILD_GMOCK=OFF gtest_force_shared_crt=ON CMAKE_CXX_FLAGS=${gtest_cxx_flags}
-)
-
 hunter_config(
     CLI11
     VERSION 1.9.1

diff --git a/cmake/Hunter/init.cmake b/cmake/Hunter/init.cmake
@@ -1,12 +1,12 @@
 # EVMC: Ethereum Client-VM Connector API.
-# Copyright 2018-2019 The EVMC Authors.
+# Copyright 2018 The EVMC Authors.
 # Licensed under the Apache License, Version 2.0.
 
 # Setup Hunter.
 # Hunter is going to be initialized only if building with tests,
 # where it is needed to get dependencies.
 HunterGate(
-    URL "https://github.com/ruslo/hunter/archive/v0.23.214.tar.gz"
-    SHA1 "e14bc153a7f16d6a5eeec845fb0283c8fad8c358"
+    URL "https://github.com/cpp-pm/hunter/archive/v0.23.320.tar.gz"
+    SHA1 "9b4e732afd22f40482c11ad6342f7d336634226f"
     LOCAL
 )
diff --git a/include/evmc/evmc.hpp b/include/evmc/evmc.hpp
@@ -856,7 +856,7 @@ inline evmc_access_status access_storage(evmc_host_context* h,
 
 inline const evmc_host_interface& Host::get_interface() noexcept
 {
-    static constexpr evmc_host_interface interface{
+    static constexpr evmc_host_interface interface = {
         ::evmc::internal::account_exists, ::evmc::internal::get_storage,
         ::evmc::internal::set_storage,    ::evmc::internal::get_balance,
         ::evmc::internal::get_code_size,  ::evmc::internal::get_code_hash,

diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
@@ -88,4 +88,4 @@ add_evmc_tool_test(
 )
 
 get_property(TOOLS_TESTS DIRECTORY PROPERTY TESTS)
-set_tests_properties(${TOOLS_TESTS} PROPERTIES ENVIRONMENT LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/tools-%p.profraw)
+set_tests_properties(${TOOLS_TESTS} PROPERTIES ENVIRONMENT LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/tools-%m-%p.profraw)
diff --git a/test/vmtester/CMakeLists.txt b/test/vmtester/CMakeLists.txt
@@ -31,4 +31,4 @@ add_test(NAME ${prefix}/option-long-prefix COMMAND evmc::evmc-vmtester ---)
 set_tests_properties(${prefix}/option-long-prefix PROPERTIES PASS_REGULAR_EXPRESSION "Unknown")
 
 get_property(vmtester_tests DIRECTORY PROPERTY TESTS)
-set_tests_properties(${vmtester_tests} PROPERTIES ENVIRONMENT LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/vmtester-%p.profraw)
+set_tests_properties(${vmtester_tests} PROPERTIES ENVIRONMENT LLVM_PROFILE_FILE=${CMAKE_BINARY_DIR}/vmtester-%m-%p.profraw)