CI: Define base environments in terms of environments of dicts they depend on

This commit is contained in:
Kamil Śliwak 2023-06-23 12:55:19 +02:00
parent d12a981ba8
commit 793adc8106

View File

@ -363,11 +363,10 @@ defaults:
MAKEFLAGS: -j 3
- base_archlinux_large: &base_archlinux_large
docker:
- image: archlinux:base
<<: *base_archlinux
resource_class: large
environment: &base_archlinux_large_env
TERM: xterm
<<: *base_archlinux_env
MAKEFLAGS: -j 5
- base_cimg_small: &base_cimg_small
@ -403,11 +402,10 @@ defaults:
MAKEFLAGS: -j5
- base_osx_large: &base_osx_large
macos:
xcode: "14.2.0"
<<: *base_osx
resource_class: large
environment: &base_osx_large_env
TERM: xterm
<<: *base_osx_env
MAKEFLAGS: -j10
- base_python_small: &base_python_small
@ -429,7 +427,7 @@ defaults:
<<: *base_ubuntu_clang
resource_class: small
environment: &base_ubuntu_clang_small_env
TERM: xterm
<<: *base_ubuntu_clang_env
MAKEFLAGS: -j 2
- base_ubuntu2004: &base_ubuntu2004
@ -443,14 +441,14 @@ defaults:
<<: *base_ubuntu2004
resource_class: small
environment: &base_ubuntu2004_small_env
TERM: xterm
<<: *base_ubuntu2004_env
MAKEFLAGS: -j 2
- base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
<<: *base_ubuntu2004
resource_class: xlarge
environment: &base_ubuntu2004_xlarge_env
TERM: xterm
<<: *base_ubuntu2004_env
MAKEFLAGS: -j 10
- base_ubuntu2204: &base_ubuntu2204
@ -473,30 +471,28 @@ defaults:
<<: *base_ubuntu2204_clang
resource_class: large
environment: &base_ubuntu2204_clang_large_env
TERM: xterm
CC: clang
CXX: clang++
<<: *base_ubuntu2204_clang_env
MAKEFLAGS: -j 5
- base_ubuntu2204_small: &base_ubuntu2204_small
<<: *base_ubuntu2204
resource_class: small
environment: &base_ubuntu2204_small_env
TERM: xterm
<<: *base_ubuntu2204_env
MAKEFLAGS: -j 2
- base_ubuntu2204_large: &base_ubuntu2204_large
<<: *base_ubuntu2204
resource_class: large
environment: &base_ubuntu2204_large_env
TERM: xterm
<<: *base_ubuntu2204_env
MAKEFLAGS: -j 5
- base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
<<: *base_ubuntu2204
resource_class: xlarge
environment: &base_ubuntu2204_xlarge_env
TERM: xterm
<<: *base_ubuntu2204_env
MAKEFLAGS: -j 10
- base_win: &base_win