From 2da5980af116a009a77f81c4331257c61647a08f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Sat, 18 Jun 2022 16:59:54 +0200
Subject: [PATCH 1/4] ci: Add CMake min version build

---
 circle.yml | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/circle.yml b/circle.yml
index f73cccac36..9d8ce119cc 100644
--- a/circle.yml
+++ b/circle.yml
@@ -47,6 +47,12 @@ executors:
     resource_class: small
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
+  linux-base:
+    docker:
+      - image: cimg/base:edge-22.04
+    resource_class: small
+    environment:
+      CMAKE_BUILD_PARALLEL_LEVEL: 2
   macos:
     macos:
       xcode: 13.4
@@ -54,6 +60,17 @@ executors:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
 
 commands:
+  install_cmake:
+    parameters:
+      version:
+        type: string
+    steps:
+      - run:
+          name: "Install CMake <<parameters.version>>"
+          working_directory: /usr/local
+          command: |
+            curl -L https://github.com/Kitware/CMake/releases/download/v<<parameters.version>>/cmake-<<parameters.version>>-linux-x86_64.tar.gz | sudo tar -xz --strip=1
+
   build_silkworm:
     parameters:
       branch:
@@ -438,6 +455,14 @@ jobs:
       - build
       - test
 
+  cmake-min:
+    executor: linux-base
+    steps:
+      - install_cmake:
+          version: 3.16.9
+      - build
+      - test
+
 workflows:
   version: 2
   evmone:
@@ -463,6 +488,7 @@ workflows:
             tags:
               only: /^v[0-9].*/
       - consensus-tests
+      - cmake-min
       - gcc-min
       - clang-min
       - gcc-latest-coverage

From 3ebb6339bd39c5abf623acc39ae87c10160e323d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Sat, 18 Jun 2022 17:51:51 +0200
Subject: [PATCH 2/4] ci: Use bigger executor for clang sanitizers

---
 circle.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 9d8ce119cc..3eee8e600a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -24,7 +24,7 @@ executors:
     resource_class: xlarge
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 8
-  fuzzing:
+  linux-clang-xlarge:
     docker:
       - image: ethereum/cpp-build-env:18-clang-14
     resource_class: xlarge
@@ -386,7 +386,7 @@ jobs:
       - test
 
   clang-latest-sanitizers:
-    executor: linux-clang-latest
+    executor: linux-clang-xlarge
     environment:
       CMAKE_OPTIONS: -DBUILD_SHARED_LIBS=NO -DSANITIZE=address,undefined,shift-exponent,implicit-conversion,nullability -DCMAKE_CXX_CLANG_TIDY=clang-tidy
       UBSAN_OPTIONS: halt_on_error=1
@@ -423,7 +423,7 @@ jobs:
           destination: coverage
 
   fuzzing:
-    executor: fuzzing
+    executor: linux-clang-xlarge
     environment:
       CMAKE_OPTIONS: -DEVMONE_FUZZING=ON
     steps:

From ef93a38e79373d13e1c9862fea6badd271133f75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Sat, 18 Jun 2022 17:46:00 +0200
Subject: [PATCH 3/4] cmake: Require CMake 3.16

Bump the minimum required CMake version to 3.16. This is already fact
because required by ethash. Also specify max version 3.23 for policy
settings.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5dfe53bdb1..dc25cc35f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Copyright 2019 The evmone Authors.
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.16...3.23)
 
 if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/evmc/.git)
     message(FATAL_ERROR "Git submodules not initialized, execute:\n  git submodule update --init")

From 8272d6ef4532dada58017f87206d6fc57af41851 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Fri, 17 Jun 2022 22:28:22 +0200
Subject: [PATCH 4/4] cmake: Fix -Wextra-semi usage

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc25cc35f2..a9bb7f4593 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,10 @@ if(CABLE_COMPILER_GNULIKE)
     add_compile_options(
         -Wmissing-declarations
         -Wno-attributes  # Allow using unknown attributes.
+        $<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>
     )
     cable_add_cxx_compiler_flag_if_supported(-Wduplicated-cond)
     cable_add_cxx_compiler_flag_if_supported(-Wduplicate-enum)
-    cable_add_cxx_compiler_flag_if_supported(-Wextra-semi)
     cable_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
     cable_add_cxx_compiler_flag_if_supported(-Wlogical-op)
     cable_add_cxx_compiler_flag_if_supported(-Wnewline-eof)