Skip to content

Commit

Permalink
Merge pull request #467 from ethereum/ci
Browse files Browse the repository at this point in the history
CI: Upgrade compilers to GCC 12 and clang 14
  • Loading branch information
chfast authored Jun 14, 2022
2 parents ae7e826 + d0e67b1 commit 28738f4
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 17 deletions.
32 changes: 16 additions & 16 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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

Expand Down Expand Up @@ -161,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)"
Expand Down Expand Up @@ -347,11 +355,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
Expand All @@ -375,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
Expand Down
8 changes: 7 additions & 1 deletion test/utils/utils.cpp
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit 28738f4

Please sign in to comment.