Cirrus CI: Switch to build_matrix.sh. [skip appveyor] [skip travis]

Replace most of the task script commands with build_matrix.sh. Extend
the latter to allow overriding the matrix dimensions if required and use
that to add two versions of GCC to the nested matrix. Name the task.

1 files changed, 3 insertions, 3 deletions

diff --git a/build_matrix.sh b/build_matrix.sh
index 538f6210..934a2aac 100755
--- a/build_matrix.sh
+++ b/build_matrix.sh
@@ -28,13 +28,13 @@ echo_magenta() {
 }
 
 touch .devel configure
-for CC in gcc clang; do
+for CC in ${MATRIX_CC:-gcc clang}; do
     export CC
     # Exclude gcc on OSX (it is just an alias for clang)
     if [ "$CC" = gcc ] && [ "$TRAVIS_OS_NAME" = osx ]; then continue; fi
-    for CMAKE in no yes; do
+    for CMAKE in ${MATRIX_CMAKE:-no yes}; do
         export CMAKE
-        for REMOTE in no yes; do
+        for REMOTE in ${MATRIX_REMOTE:-no yes}; do
             export REMOTE
             echo_magenta "===== SETUP: compiler:$CC cmake:$CMAKE remote:$REMOTE ====="
             # LABEL is needed to build the travis fold labels