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.

diff --git a/.cirrus.yml b/.cirrus.yml
index 3acce25ae0735b18af0067f014bc98fd2074010a..55325f408d00410aa399c4406d1711631d63408e 100644 (file)
--- 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

diff --git a/.travis.yml b/.travis.yml
index 1b55b899551dd8ac6d5ccdd8530eca05da45e319..fbaaddfdf822c310c7538ce0b35bae62e2d54ae7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ arch:
 
 os:
   - linux
-  - osx
 
 dist: focal
 
@@ -55,14 +54,6 @@ dist: focal
 jobs:
   fast_finish: true
   exclude:
-  - arch: ppc64le
-    os: osx
-  - arch: s390x
-    os: osx
-  - arch: arm64
-    os: osx
-  - compiler: gcc
-    os: osx
   - if: branch = coverity_scan
     arch: ppc64le
   - if: branch = coverity_scan
@@ -122,12 +113,8 @@ before_install:
   - uname -a
   - date
   - gem install travis-conditions
-  - if [ "$TRAVIS_OS_NAME" = osx ]; then brew update >/dev/null; fi
   - if [ "$TRAVIS_OS_NAME" = linux ]; then apt list --installed 'lib*-dev'; fi
 
-install:
-  - if [ "$TRAVIS_OS_NAME" = osx ]; then brew install libsmi | grep -v '%'; fi
-
 before_script:
   - (cd .. && echo '$ git clone [...] libpcap.git' && git clone --depth 3 --branch=master --quiet git://github.com/the-tcpdump-group/libpcap.git)
 
@@ -137,4 +124,3 @@ script:
   #
   - if [ "$COVERITY_SCAN_BRANCH" = 1 ]; then if [ "$TRAVIS_OS_NAME" = linux ]; then travis_terminate 0; else exit 0; fi; fi
   - ./build_matrix.sh
-  - if [ "$TRAVIS_OS_NAME" = osx ]; then sleep 10; fi