diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2021-02-10 16:27:15 +0000 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2021-02-10 16:35:11 +0000 |
| commit | becccac4f5b00cd37af360ac89c138e3b31ddf97 (patch) | |
| tree | d7b556b917f0b6af3a9728323e15813ddad85ced /.cirrus.yml | |
| parent | e3d6a612800e84439070e78c8a3faac10ab6ecfc (diff) | |
| download | tcpdump-becccac4f5b00cd37af360ac89c138e3b31ddf97.tar.gz | |
Cirrus CI: Refine some resource allocation. [skip appveyor] [skip travis]
For FreeBSD and Linux request less memory than the default 4 GB.
Cirrus build graph claims that both FreeBSD and Linux tasks never use
more than 2 CPUs. For FreeBSD request 2 CPUs instead of 4 to enable all
three permutations run in parallel. For Linux request 4 CPUs instead of
8 to enable two concurrent tasks and split the nested matrix into two to
take advantage of that.
For macOS move and expand the comment.
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 5ad36a75..1c0be6e3 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,14 +5,15 @@ env: freebsd_task: name: FBSD+BM freebsd_instance: - cpu: 4 # allows two concurrent FreeBSD tasks + cpu: 2 # up to 4 concurrent FreeBSD tasks + memory: 2G # fails to start with 1 GB matrix: - image_family: freebsd-11-4 - image_family: freebsd-12-2 - image_family: freebsd-13-0-snap env: IGNORE_OSVERSION: yes - MAKEFLAGS: -j 4 + MAKEFLAGS: -j 3 MATRIX_CC: clang gcc10 script: - freebsd-version @@ -25,11 +26,15 @@ freebsd_task: linux_task: name: LNX+BM container: - cpu: 8 # allows one concurrent Linux task + cpu: 4 # up to 2 concurrent Linux tasks + memory: 1G image: ubuntu:20.04 env: DEBIAN_FRONTEND: noninteractive - MAKEFLAGS: -j 8 + MAKEFLAGS: -j 5 + matrix: + - MATRIX_CC: gcc + - MATRIX_CC: clang script: - apt-get -qy update - apt-get -qy install git autoconf make cmake clang gcc @@ -43,8 +48,9 @@ macos_task: name: MAC+BM macos_instance: image: big-sur-xcode + # "cpu" and "memory" are invalid keywords for macOS tasks now env: - MAKEFLAGS: '-j 12' # macOS VMs always run on 12 cores + MAKEFLAGS: '-j 12' MATRIX_CC: clang # GCC is a symlink to Clang in macOS script: - brew update >/dev/null |