CI: Relax the branch filters back. [skip ci]

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.

diff --git a/.appveyor.yml b/.appveyor.yml
index 9cf74c3d1b1675d887d40b6de92e1744aabbd6f3..426d287b5f2e028789602c5ce020417750fbf730 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,9 +3,8 @@ version: '{build}'
 clone_depth: 5
 
 branches:
-  only:
-    - master
-    - tcpdump-4.99
+  except:
+    - coverity_scan
 
 matrix:
   fast_finish: true

diff --git a/.cirrus.yml b/.cirrus.yml
index de8be9ac64007e0b5f8ffbf25bda23d3e3cb425b..7bfe82faf6d6e4a0778c59a698f0276d9fa72903 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -4,7 +4,7 @@ env:
 
 freebsd_task:
   name: FBSD+BM
-  only_if: $CIRRUS_BRANCH == master || $CIRRUS_BRANCH == tcpdump-4.99
+  only_if: $CIRRUS_BRANCH != coverity_scan
   freebsd_instance:
     # FreeBSD fails to start with 1 GB. 8 CPUs max concurrency.
     matrix:
@@ -32,7 +32,7 @@ freebsd_task:
 
 linux_task:
   name: LNX+BM
-  only_if: $CIRRUS_BRANCH == master || $CIRRUS_BRANCH == tcpdump-4.99
+  only_if: $CIRRUS_BRANCH != coverity_scan
   container:
     # Linux works just fine with 1 GB. 16 CPUs max concurrency.
     cpu: 4
@@ -55,7 +55,7 @@ linux_task:
 
 macos_task:
   name: MAC+BM
-  only_if: $CIRRUS_BRANCH == master || $CIRRUS_BRANCH == tcpdump-4.99
+  only_if: $CIRRUS_BRANCH != coverity_scan
   macos_instance:
     image: big-sur-xcode
     # "cpu" and "memory" are invalid keywords for macOS tasks now

diff --git a/.travis.yml b/.travis.yml
index 7343a84a16d367f4bb067c28198bc2bf799ad9f2..03262b5d8345baad0244805482a4a2bbca45cfe7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,10 +20,10 @@ jobs:
   include:
   - name: "ppc64le"
     arch: ppc64le
-    if: branch IN (master, tcpdump-4.99)
+    if: branch != coverity_scan
   - name: "s390x"
     arch: s390x
-    if: branch IN (master, tcpdump-4.99)
+    if: branch != coverity_scan
   allow_failures:
     - arch: ppc64le # Since 20 Feb 2021 often times out trying to boot.