ci: Optimize build matrix

Author: real-or-random

.cirrus.yml

@@ -59,18 +59,16 @@ task:
     # More than enough for our scripts.
     memory: 1G
   matrix: &ENV_MATRIX
-    - env: {WIDEMUL:  int64,  RECOVERY: yes}
-    - env: {WIDEMUL:  int64,                 ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes}
-    - env: {WIDEMUL: int128}
-    - env: {WIDEMUL: int128,  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes}
-    - env: {WIDEMUL: int128,                 ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes}
-    - env: {WIDEMUL: int128,  ASM: x86_64}
-    - env: {                  RECOVERY: yes,            EXPERIMENTAL: yes, SCHNORRSIG: yes}
-    - env: {BUILD: distcheck, WITH_VALGRIND: no, CTIMETEST: no, BENCH: no}
-    - env: {CPPFLAGS: -DDETERMINISTIC}
-    - env: {CFLAGS: -O0, CTIMETEST: no}
-    - env: { ECMULTGENPRECISION: 2, ECMULTWINDOW: 4 }
-    - env: { ECMULTGENPRECISION: 8, ECMULTWINDOW: 8 }
+    - env: { WIDEMUL:  int64, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes, ASM: x86_64 }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes, ASM: x86_64, ECMULTWINDOW: 4, ECMULTGENPRECISION: 2 }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes,              ECMULTWINDOW: 8, ECMULTGENPRECISION: 8 }
+    - env: { }
+    - env: {                  RECOVERY: yes, ECDH: yes }
+    - env: { BUILD: distcheck, WITH_VALGRIND: no, CTIMETEST: no, BENCH: no }
+    - env: { CPPFLAGS: -DDETERMINISTIC }
+    - env: { CFLAGS: -O0, CTIMETEST: no }
   matrix:
     - env:
         CC: gcc
@@ -113,7 +111,11 @@ task:
     # Cirrus gives us a fixed number of 12 virtual CPUs. Not that we even have that many jobs at the moment...
     MAKEFLAGS: -j13
   matrix:
-    << : *ENV_MATRIX
+    - env: { WIDEMUL:  int64, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes }
+    - env: { WIDEMUL: int128, RECOVERY: yes, ECDH: yes, EXPERIMENTAL: yes, SCHNORRSIG: yes, ASM: x86_64 }
+    - env: { BUILD: distcheck, WITH_VALGRIND: no, CTIMETEST: no, BENCH: no }
+    - env: { CFLAGS: -O0, CTIMETEST: no }
   matrix:
     - env:
         CC: gcc-9