Cirrus CI: Try to speed FreeBSD 13.0 up. [skip appveyor] [skip travis]

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.

diff --git a/.cirrus.yml b/.cirrus.yml
index 1c0be6e3a885b534a11933332468610532b868f0..1188ac55a2f4f51872847ca11363e1b46ff953fc 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,15 +5,21 @@ env:
 freebsd_task:
   name: FBSD+BM
   freebsd_instance:
-    cpu: 2 # up to 4 concurrent FreeBSD tasks
-    memory: 2G # fails to start with 1 GB
+    # FreeBSD fails to start with 1 GB. 8 CPUs max concurrency.
     matrix:
       - image_family: freebsd-11-4
+        cpu: 2
+        memory: 2G
       - image_family: freebsd-12-2
+        cpu: 2
+        memory: 2G
       - image_family: freebsd-13-0-snap
+        # This one is much slower than the others.
+        cpu: 4
+        memory: 4G
   env:
     IGNORE_OSVERSION: yes
-    MAKEFLAGS: -j 3
+    MAKEFLAGS: -j 4
     MATRIX_CC: clang gcc10
   script:
     - freebsd-version
@@ -26,7 +32,8 @@ freebsd_task:
 linux_task:
   name: LNX+BM
   container:
-    cpu: 4 # up to 2 concurrent Linux tasks
+    # Linux works just fine with 1 GB. 16 CPUs max concurrency.
+    cpu: 4
     memory: 1G
     image: ubuntu:20.04
   env: