From d12a981ba80fe9cfa3635243a0dfd3f00b6a7900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Fri, 23 Jun 2023 12:52:46 +0200 Subject: [PATCH] CI: Define aliases for all the base environment dicts --- .circleci/config.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bbf52f974..a9bf33a37 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -358,7 +358,7 @@ defaults: - base_archlinux: &base_archlinux docker: - image: archlinux:base - environment: + environment: &base_archlinux_env TERM: xterm MAKEFLAGS: -j 3 @@ -366,7 +366,7 @@ defaults: docker: - image: archlinux:base resource_class: large - environment: + environment: &base_archlinux_large_env TERM: xterm MAKEFLAGS: -j 5 @@ -374,7 +374,7 @@ defaults: docker: - image: cimg/base:current resource_class: small - environment: + environment: &base_cimg_small_env TERM: xterm MAKEFLAGS: -j 2 @@ -382,7 +382,7 @@ defaults: docker: - image: << pipeline.parameters.emscripten-docker-image >> resource_class: large - environment: + environment: &base_ems_large_env TERM: xterm MAKEFLAGS: -j 5 @@ -390,7 +390,7 @@ defaults: docker: - image: cimg/node:current resource_class: small - environment: + environment: &base_node_small_env TERM: xterm MAKEFLAGS: -j 2 @@ -398,7 +398,7 @@ defaults: macos: xcode: "14.2.0" resource_class: macos.x86.medium.gen2 - environment: + environment: &base_osx_env TERM: xterm MAKEFLAGS: -j5 @@ -406,7 +406,7 @@ defaults: macos: xcode: "14.2.0" resource_class: large - environment: + environment: &base_osx_large_env TERM: xterm MAKEFLAGS: -j10 @@ -414,56 +414,56 @@ defaults: docker: - image: cimg/python:3.6 resource_class: small - environment: + environment: &base_python_small_env TERM: xterm MAKEFLAGS: -j 2 - base_ubuntu_clang: &base_ubuntu_clang docker: - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >> - environment: + environment: &base_ubuntu_clang_env TERM: xterm MAKEFLAGS: -j 3 - base_ubuntu_clang_small: &base_ubuntu_clang_small <<: *base_ubuntu_clang resource_class: small - environment: + environment: &base_ubuntu_clang_small_env TERM: xterm MAKEFLAGS: -j 2 - base_ubuntu2004: &base_ubuntu2004 docker: - image: << pipeline.parameters.ubuntu-2004-docker-image >> - environment: + environment: &base_ubuntu2004_env TERM: xterm MAKEFLAGS: -j 3 - base_ubuntu2004_small: &base_ubuntu2004_small <<: *base_ubuntu2004 resource_class: small - environment: + environment: &base_ubuntu2004_small_env TERM: xterm MAKEFLAGS: -j 2 - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge <<: *base_ubuntu2004 resource_class: xlarge - environment: + environment: &base_ubuntu2004_xlarge_env TERM: xterm MAKEFLAGS: -j 10 - base_ubuntu2204: &base_ubuntu2204 docker: - image: << pipeline.parameters.ubuntu-2204-docker-image >> - environment: + environment: &base_ubuntu2204_env TERM: xterm MAKEFLAGS: -j 3 - base_ubuntu2204_clang: &base_ubuntu2204_clang docker: - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >> - environment: + environment: &base_ubuntu2204_clang_env TERM: xterm CC: clang CXX: clang++ @@ -472,7 +472,7 @@ defaults: - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large <<: *base_ubuntu2204_clang resource_class: large - environment: + environment: &base_ubuntu2204_clang_large_env TERM: xterm CC: clang CXX: clang++ @@ -481,21 +481,21 @@ defaults: - base_ubuntu2204_small: &base_ubuntu2204_small <<: *base_ubuntu2204 resource_class: small - environment: + environment: &base_ubuntu2204_small_env TERM: xterm MAKEFLAGS: -j 2 - base_ubuntu2204_large: &base_ubuntu2204_large <<: *base_ubuntu2204 resource_class: large - environment: + environment: &base_ubuntu2204_large_env TERM: xterm MAKEFLAGS: -j 5 - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge <<: *base_ubuntu2204 resource_class: xlarge - environment: + environment: &base_ubuntu2204_xlarge_env TERM: xterm MAKEFLAGS: -j 10