cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14478 from ethereum/set-soltest-cpus-in-circleci-config

Browse Source 
Set CPUs for `soltest.sh` based on the number of available cores
This commit is contained in:
Kamil Śliwak 2023-08-09 11:58:55 +02:00 committed by GitHub
commit 3edf91adc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.circleci/config.yml
View File

@ -366,6 +366,7 @@ defaults:
environment: &base_archlinux_env environment: &base_archlinux_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 3 MAKEFLAGS: -j 3
CPUs: 3
- base_archlinux_large: &base_archlinux_large - base_archlinux_large: &base_archlinux_large
<<: *base_archlinux <<: *base_archlinux
@ -373,6 +374,7 @@ defaults:
environment: &base_archlinux_large_env environment: &base_archlinux_large_env
<<: *base_archlinux_env <<: *base_archlinux_env
MAKEFLAGS: -j 5 MAKEFLAGS: -j 5
CPUs: 5
- base_cimg_small: &base_cimg_small - base_cimg_small: &base_cimg_small
docker: docker:
@ -381,6 +383,7 @@ defaults:
environment: &base_cimg_small_env environment: &base_cimg_small_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_ems_large: &base_ems_large - base_ems_large: &base_ems_large
docker: docker:
@ -389,6 +392,7 @@ defaults:
environment: &base_ems_large_env environment: &base_ems_large_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 5 MAKEFLAGS: -j 5
CPUs: 5
- base_node_small: &base_node_small - base_node_small: &base_node_small
docker: docker:
@ -397,6 +401,7 @@ defaults:
environment: &base_node_small_env environment: &base_node_small_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_osx: &base_osx - base_osx: &base_osx
macos: macos:
@ -405,6 +410,7 @@ defaults:
environment: &base_osx_env environment: &base_osx_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j5 MAKEFLAGS: -j5
CPUs: 5
- base_osx_large: &base_osx_large - base_osx_large: &base_osx_large
<<: *base_osx <<: *base_osx
@ -412,6 +418,7 @@ defaults:
environment: &base_osx_large_env environment: &base_osx_large_env
<<: *base_osx_env <<: *base_osx_env
MAKEFLAGS: -j10 MAKEFLAGS: -j10
CPUs: 10
- base_python_small: &base_python_small - base_python_small: &base_python_small
docker: docker:
@ -420,6 +427,7 @@ defaults:
environment: &base_python_small_env environment: &base_python_small_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_ubuntu_clang: &base_ubuntu_clang - base_ubuntu_clang: &base_ubuntu_clang
docker: docker:
@ -427,6 +435,7 @@ defaults:
environment: &base_ubuntu_clang_env environment: &base_ubuntu_clang_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 3 MAKEFLAGS: -j 3
CPUs: 3
- base_ubuntu_clang_small: &base_ubuntu_clang_small - base_ubuntu_clang_small: &base_ubuntu_clang_small
<<: *base_ubuntu_clang <<: *base_ubuntu_clang
@ -434,6 +443,7 @@ defaults:
environment: &base_ubuntu_clang_small_env environment: &base_ubuntu_clang_small_env
<<: *base_ubuntu_clang_env <<: *base_ubuntu_clang_env
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_ubuntu2004: &base_ubuntu2004 - base_ubuntu2004: &base_ubuntu2004
docker: docker:
@ -441,6 +451,7 @@ defaults:
environment: &base_ubuntu2004_env environment: &base_ubuntu2004_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 3 MAKEFLAGS: -j 3
CPUs: 3
- base_ubuntu2004_small: &base_ubuntu2004_small - base_ubuntu2004_small: &base_ubuntu2004_small
<<: *base_ubuntu2004 <<: *base_ubuntu2004
@ -448,6 +459,7 @@ defaults:
environment: &base_ubuntu2004_small_env environment: &base_ubuntu2004_small_env
<<: *base_ubuntu2004_env <<: *base_ubuntu2004_env
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
<<: *base_ubuntu2004 <<: *base_ubuntu2004
@ -455,6 +467,7 @@ defaults:
environment: &base_ubuntu2004_xlarge_env environment: &base_ubuntu2004_xlarge_env
<<: *base_ubuntu2004_env <<: *base_ubuntu2004_env
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
CPUs: 10
- base_ubuntu2204: &base_ubuntu2204 - base_ubuntu2204: &base_ubuntu2204
docker: docker:
@ -462,6 +475,7 @@ defaults:
environment: &base_ubuntu2204_env environment: &base_ubuntu2204_env
TERM: xterm TERM: xterm
MAKEFLAGS: -j 3 MAKEFLAGS: -j 3
CPUs: 3
- base_ubuntu2204_clang: &base_ubuntu2204_clang - base_ubuntu2204_clang: &base_ubuntu2204_clang
docker: docker:
@ -471,6 +485,7 @@ defaults:
CC: clang CC: clang
CXX: clang++ CXX: clang++
MAKEFLAGS: -j 3 MAKEFLAGS: -j 3
CPUs: 3
- base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
<<: *base_ubuntu2204_clang <<: *base_ubuntu2204_clang
@ -478,6 +493,7 @@ defaults:
environment: &base_ubuntu2204_clang_large_env environment: &base_ubuntu2204_clang_large_env
<<: *base_ubuntu2204_clang_env <<: *base_ubuntu2204_clang_env
MAKEFLAGS: -j 5 MAKEFLAGS: -j 5
CPUs: 5
- base_ubuntu2204_small: &base_ubuntu2204_small - base_ubuntu2204_small: &base_ubuntu2204_small
<<: *base_ubuntu2204 <<: *base_ubuntu2204
@ -485,6 +501,7 @@ defaults:
environment: &base_ubuntu2204_small_env environment: &base_ubuntu2204_small_env
<<: *base_ubuntu2204_env <<: *base_ubuntu2204_env
MAKEFLAGS: -j 2 MAKEFLAGS: -j 2
CPUs: 2
- base_ubuntu2204_large: &base_ubuntu2204_large - base_ubuntu2204_large: &base_ubuntu2204_large
<<: *base_ubuntu2204 <<: *base_ubuntu2204
@ -492,6 +509,7 @@ defaults:
environment: &base_ubuntu2204_large_env environment: &base_ubuntu2204_large_env
<<: *base_ubuntu2204_env <<: *base_ubuntu2204_env
MAKEFLAGS: -j 5 MAKEFLAGS: -j 5
CPUs: 5
- base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
<<: *base_ubuntu2204 <<: *base_ubuntu2204
@ -499,6 +517,7 @@ defaults:
environment: &base_ubuntu2204_xlarge_env environment: &base_ubuntu2204_xlarge_env
<<: *base_ubuntu2204_env <<: *base_ubuntu2204_env
MAKEFLAGS: -j 10 MAKEFLAGS: -j 10
CPUs: 10
- base_win: &base_win - base_win: &base_win
executor: executor:

2
.circleci/soltest.sh
View File

@ -36,6 +36,7 @@ set -e
OPTIMIZE=${OPTIMIZE:-"0"} OPTIMIZE=${OPTIMIZE:-"0"}
EVM=${EVM:-"invalid"} EVM=${EVM:-"invalid"}
CPUs=${CPUs:-3}
REPODIR="$(realpath "$(dirname "$0")/..")" REPODIR="$(realpath "$(dirname "$0")/..")"
IFS=" " read -r -a BOOST_TEST_ARGS <<< "$BOOST_TEST_ARGS" IFS=" " read -r -a BOOST_TEST_ARGS <<< "$BOOST_TEST_ARGS"
@ -67,7 +68,6 @@ get_logfile_basename() {
# long-running test cases are next to each other. # long-running test cases are next to each other.
CIRCLE_NODE_INDEX=$(((CIRCLE_NODE_INDEX + 23 * INDEX_SHIFT) % CIRCLE_NODE_TOTAL)) CIRCLE_NODE_INDEX=$(((CIRCLE_NODE_INDEX + 23 * INDEX_SHIFT) % CIRCLE_NODE_TOTAL))
CPUs=3
PIDs=() PIDs=()
for run in $(seq 0 $((CPUs - 1))) for run in $(seq 0 $((CPUs - 1)))
do do