Lose travis-conditions in the Travis CI script. Simplify libpcap
cloning. Dissolve choose_libpcap() as it just packed two separate
single-use functions into one, also lose a temporary variable. Fixup
indentation.
Address feedback from Francois-Xavier and do not limit everyday CI to
the branches that are known-good for running build_matrix.sh, only mind
to skip the coverity_scan branch. Although this arrangement is not what
an upstream repository should use, it keeps CI simple in fork
repositories that have arbitrarily named branches with a working
build_matrix.sh.
This should also restore pull requests CI if the strict filters had
affected it.
Whatever the underlying reason, freebsd-13-0-snap used to take a couple
times more time to make it through the build than the other two image
families. After switching to the full nested matrix this started to
cause task timeouts and rescheduling. Let's see if a different
distribution of resources can improve this. Update the Linux task
comment while at it.
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.
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.
Use FreeBSD 11.4-RELEASE and 12.1-RELEASE instead of 11.3-CURRENT and
12.1-CURRENT, this allows to drop "pkg update -f", which was a
workaround for 11.3-CURRENT (see commit 96c4db3), and which had later
broken in 13.0-CURRENT. Relates to cirruslabs/cirrus-ci-docs#695.
The error was like:
Newer FreeBSD version for package nagios-check_redis:
To ignore this error set IGNORE_OSVERSION=yes
- package: 1300081
- running kernel: 1300078