From 969591bfdadd1946cab23a5e12df606a8fffa624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Tue, 24 May 2022 23:36:11 +0200
Subject: [PATCH 1/3] utils: Workaround GCC 12 warning in std::function

---
 test/utils/utils.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/utils/utils.cpp b/test/utils/utils.cpp
index 9584c65f52..2f6f601258 100644
--- a/test/utils/utils.cpp
+++ b/test/utils/utils.cpp
@@ -1,8 +1,14 @@
 // evmone: Fast Ethereum Virtual Machine implementation
-// Copyright 2018-2019 The evmone Authors.
+// Copyright 2018 The evmone Authors.
 // SPDX-License-Identifier: Apache-2.0
 
 #include "utils.hpp"
+
+#if __GNUC__ >= 12
+// Workaround the bug related to std::regex and std::function:
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105562.
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
 #include <regex>
 
 bytes from_hexx(const std::string& hexx)

From 5a67c13201aec474e0482c80bb47f668053b1885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Tue, 14 Jun 2022 14:26:30 +0200
Subject: [PATCH 2/3] ci: Upgrade compilers

---
 circle.yml | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/circle.yml b/circle.yml
index af020dc871..bf0c2cad3c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -3,18 +3,24 @@ version: 2.1
 executors:
   lint:
     docker:
-      - image: ethereum/cpp-build-env:17-lint
+      - image: ethereum/cpp-build-env:18-lint
     resource_class: small
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
   linux-gcc-latest:
     docker:
-      - image: ethereum/cpp-build-env:17-gcc-11
+      - image: ethereum/cpp-build-env:18-gcc-12
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 4
+  linux-gcc-multilib:
+    docker:
+      - image: ethereum/cpp-build-env:18-gcc-12-multilib
+    resource_class: small
+    environment:
+      CMAKE_BUILD_PARALLEL_LEVEL: 2
   consensus-tests:
     docker:
-      - image: ethereum/cpp-build-env:17-gcc-11
+      - image: ethereum/cpp-build-env:18-gcc-12
     resource_class: xlarge
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 8
@@ -26,7 +32,7 @@ executors:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
   linux-clang-latest:
     docker:
-      - image: ethereum/cpp-build-env:17-clang-13
+      - image: ethereum/cpp-build-env:18-clang-14
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 4
   linux-clang-min:
@@ -37,7 +43,7 @@ executors:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
   macos:
     macos:
-      xcode: 13.2.0
+      xcode: 13.4
     environment:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
 
@@ -347,11 +353,8 @@ jobs:
           command: valgrind --vgdb=no --error-exitcode=99 bin/evmone-unittests
 
   gcc-32bit:
-    docker:
-      - image: ethereum/cpp-build-env:17-gcc-11-multilib
-    resource_class: small
+    executor: linux-gcc-multilib
     environment:
-      CMAKE_BUILD_PARALLEL_LEVEL: 2
       TOOLCHAIN: cxx17-32bit
     steps:
       - build

From d0e67b146240aa2018d81f8f29d9036081c65f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Tue, 14 Jun 2022 15:32:54 +0200
Subject: [PATCH 3/3] ci: Collect test results

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

diff --git a/circle.yml b/circle.yml
index bf0c2cad3c..740eb33b60 100644
--- a/circle.yml
+++ b/circle.yml
@@ -167,7 +167,9 @@ commands:
     - run:
         name: "Test"
         working_directory: ~/build
-        command: ctest -R ${TESTS_FILTER:-'.*'} --schedule-random --output-on-failure --parallel $CMAKE_BUILD_PARALLEL_LEVEL
+        command: ctest -R ${TESTS_FILTER:-'.*'} --schedule-random --output-on-failure --parallel $CMAKE_BUILD_PARALLEL_LEVEL --output-junit ~/test_results/evmone.xml
+    - store_test_results:
+        path: ~/test_results
 
   collect_coverage_gcc:
     description: "Collect coverage data (GCC)"
@@ -378,12 +380,7 @@ jobs:
       TESTS_FILTER: unittests|integration
     steps:
       - build
-      # TODO: use `test` command
-      - run:
-          name: "Run unit tests"
-          working_directory: ~/build
-          command: |
-            bin/evmone-unittests
+      - test
       - run:
           name: "Coverage report"
           working_directory: ~/build