ci: Upgrade executors

chfast · Feb 17, 2021 · b77f6ff · b77f6ff
1 parent 70d0b94
commit b77f6ff
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1,5 +1,16 @@
 version: 2.1
 
+executors:
+  linux-gcc-latest:
+    docker:
+      - image: ethereum/cpp-build-env:16-gcc-10
+  linux-clang-latest:
+    docker:
+      - image: ethereum/cpp-build-env:16-clang-11
+  macos:
+    macos:
+      xcode: 11.6.0
+
 commands:
   install_deps:
     description: "Install dependencies"
@@ -56,8 +67,7 @@ commands:
 jobs:
 
   build-minimal:
-    docker:
-      - image: ethereum/cpp-build-env:14-gcc-10
+    executor: linux-gcc-latest
     steps:
       - checkout
       - run:
@@ -76,8 +86,7 @@ jobs:
       - BUILD_TYPE: Debug
       - TESTS_FILTER: unittests
       - TESTS_EXCLUDE: random
-    docker:
-      - image: ethereum/cpp-build-env:14-gcc-10
+    executor: linux-gcc-latest
     steps:
       - install_deps
       - build_and_test
@@ -88,8 +97,7 @@ jobs:
       - BUILD_TYPE: Coverage
       - TESTS_FILTER: unittests
       - TESTS_EXCLUDE: random
-    docker:
-      - image: ethereum/cpp-build-env:14-clang-10
+    executor: linux-clang-latest
     steps:
       - install_deps
       - build_and_test
@@ -130,8 +138,7 @@ jobs:
       - BUILD_TYPE: RelWithDebInfo
       - CMAKE_OPTIONS: -DSANITIZE=address,undefined,implicit-conversion,nullability -DCMAKE_CXX_CLANG_TIDY=clang-tidy
       - UBSAN_OPTIONS: halt_on_error=1
-    docker:
-      - image: ethereum/cpp-build-env:14-clang-10
+    executor: linux-clang-latest
     steps:
       - install_deps
       - build_and_test
@@ -144,8 +151,7 @@ jobs:
       - CMAKE_OPTIONS: -DSANITIZE=address,pointer-compare,pointer-subtract,leak,undefined
       - ASAN_OPTIONS: detect_invalid_pointer_pairs=2
       - UBSAN_OPTIONS: halt_on_error=1
-    docker:
-      - image: ethereum/cpp-build-env:14-gcc-10
+    executor: linux-gcc-latest
     steps:
       - install_deps
       - build_and_test
@@ -155,8 +161,7 @@ jobs:
     environment:
       - BUILD_TYPE: Release
       - CMAKE_OPTIONS: -DEXCEPTIONS=OFF -DRTTI=OFF
-    docker:
-      - image: ethereum/cpp-build-env:14-gcc-10
+    executor: linux-gcc-latest
     steps:
       - install_deps
       - build_and_test
@@ -168,7 +173,7 @@ jobs:
       - BUILD_TYPE: Release
       - CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=~/project/cmake/toolchains/32bit.cmake -DINTX_BENCHMARKING=OFF
     docker:
-      - image: ethereum/cpp-build-env:14-gcc-10-multilib
+      - image: ethereum/cpp-build-env:15-gcc-10-multilib
     steps:
       - build_and_test
 
@@ -177,8 +182,7 @@ jobs:
       - BUILD_PARALLEL_JOBS: 4
       - BUILD_TYPE: Release
       - CMAKE_OPTIONS: -DINTX_FUZZING=ON
-    docker:
-      - image: ethereum/cpp-build-env:14-clang-10
+    executor: linux-clang-latest
     steps:
       - install_deps
       - build_and_test
@@ -202,8 +206,7 @@ jobs:
       BUILD_TYPE: Release
       BUILD_PARALLEL_JOBS: 8
       TEST_PARALLEL_JOBS: 8
-    macos:
-      xcode: 11.5.0
+    executor: macos
     steps:
       - run:
           name: "Install deps"