diff options
| author | Denis Ovsienko <denis@ovsienko.info> | 2021-02-09 16:23:53 +0000 |
|---|---|---|
| committer | Denis Ovsienko <denis@ovsienko.info> | 2021-02-09 18:36:58 +0000 |
| commit | cb3f6ee2996f5cb384a761ae8bef85d1956589b2 (patch) | |
| tree | b3ebb5749bacc9fe2a639bd2dbecbbbf58691066 /.cirrus.yml | |
| parent | 973e9c1c9c12bdab5e038c364e62bd099d3645ec (diff) | |
| download | tcpdump-cb3f6ee2996f5cb384a761ae8bef85d1956589b2.tar.gz | |
CI: Move [AMD64] macOS from Travis to Cirrus. [skip appveyor]
This change restores macOS CI, it might also unblock the stuck Travis CI
builds, as was the case with tcpslice and libpcap earlier. Let's see.
Also refine the FreeBSD tasks a bit, but do not switch them to
build_matrix.sh yet, as that combination is currently broken.
Diffstat (limited to '.cirrus.yml')
| -rw-r--r-- | .cirrus.yml | 33 |
1 files changed, 24 insertions, 9 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 3acce25a..55325f40 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,23 +1,38 @@ env: CIRRUS_CLONE_DEPTH: 3 # The internal git client reads CIRRUS_CLONE_DEPTH. - MAKEFLAGS: '-j 2' # The build VMs currently have two CPU cores. - IGNORE_OSVERSION: yes + LIBPCAP_GIT: https://github.com/the-tcpdump-group/libpcap.git -task: +freebsd_task: + name: FBSD freebsd_instance: - image_family: $IMAGE_FAMILY - env: + cpu: 4 # allows two concurrent FreeBSD tasks matrix: - - IMAGE_FAMILY: freebsd-11-4 - - IMAGE_FAMILY: freebsd-12-2 - - IMAGE_FAMILY: freebsd-13-0-snap + - image_family: freebsd-11-4 + - image_family: freebsd-12-2 + - image_family: freebsd-13-0-snap + env: + IGNORE_OSVERSION: yes + MAKEFLAGS: -j 4 script: - freebsd-version - pkg install -qy git autoconf - - (cd .. && git clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet git://github.com/the-tcpdump-group/libpcap.git && cd libpcap && ./configure --prefix=/tmp && make -s) + - (cd .. && git clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet ${LIBPCAP_GIT} && cd libpcap && ./configure --prefix=/tmp && make -s) - touch .devel - ./configure --prefix=/tmp - make -s CFLAGS=-Werror all - make check - make install - make releasetar + +macos_task: + name: MAC+BM + macos_instance: + image: big-sur-xcode + env: + MAKEFLAGS: '-j 12' # macOS VMs always run on 12 cores + MATRIX_CC: clang # GCC is a symlink to Clang in macOS + script: + - brew update >/dev/null + - brew install libsmi | grep -v '%' + - (cd .. && echo '$ git clone [...] libpcap.git' && git clone --depth ${CIRRUS_CLONE_DEPTH} --branch=master --quiet ${LIBPCAP_GIT}) + - ./build_matrix.sh |