Arrange CI rows more logically

This is organized in a way that hopefully makes more sense when viewed in a
report.  It also puts "basic" cases first, to ensure that tedious configuration
issues are caught as early as possible when running rows sequentially for local
testing.

1 files changed, 40 insertions, 26 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cb7f1bc..c326d5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,23 +1,13 @@
 # Copyright 2019-2022 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR ISC
 
-arm32:
-  image: lv2plugin/debian-arm32
-  script:
-    - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
-    - ninja -C build test
-    - meson configure -Dbuildtype=release build
-    - ninja -C build test
-
-arm64:
-  image: lv2plugin/debian-arm64
+default:
+  image: lv2plugin/debian-x64
   script:
-    - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
-    - ninja -C build test
-    - meson configure -Dbuildtype=release build
+    - meson setup build -Dwerror=true
     - ninja -C build test
-
-x64:
+  
+dev:
   image: lv2plugin/debian-x64
   script:
     - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Db_coverage=true -Ddocs=enabled
@@ -50,6 +40,8 @@ sanitize:
   variables:
     CC: "clang"
 
+# Linux Distributions
+
 fedora:
   image: lv2plugin/fedora-dev
   script:
@@ -58,10 +50,20 @@ fedora:
   variables:
     CFLAGS: -O2 -D_FORTIFY_SOURCE=2
 
-freebsd:
-  tags: [freebsd,meson]
+# Linux Platforms
+
+arm32:
+  image: lv2plugin/debian-arm32
   script:
-    - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
+    - meson setup build --cross-file=/usr/share/meson/cross/arm-linux-gnueabihf.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
+    - ninja -C build test
+    - meson configure -Dbuildtype=release build
+    - ninja -C build test
+
+arm64:
+  image: lv2plugin/debian-arm64
+  script:
+    - meson setup build --cross-file=/usr/share/meson/cross/aarch64-linux-gnu.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
     - ninja -C build test
     - meson configure -Dbuildtype=release build
     - ninja -C build test
@@ -86,6 +88,24 @@ mingw64:
   variables:
     WINEPATH: "Z:\\usr\\lib\\gcc\\x86_64-w64-mingw32\\10-win32"
 
+wasm:
+  image: lv2plugin/debian-wasm
+  script:
+    - meson setup build --cross-file=/usr/share/meson/cross/wasm.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddefault_library=static -Ddocs=disabled
+    - ninja -C build test
+    - meson configure -Dbuildtype=release build
+    - ninja -C build test
+
+# Non-Linux/Docker rows (not hosted)
+
+freebsd:
+  tags: [freebsd,meson]
+  script:
+    - meson setup build -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddocs=disabled
+    - ninja -C build test
+    - meson configure -Dbuildtype=release build
+    - ninja -C build test
+
 mac:
   tags: [macos]
   script:
@@ -102,13 +122,7 @@ win:
     - meson configure -Dbuildtype=release build
     - ninja -C build test
 
-wasm:
-  image: lv2plugin/debian-wasm
-  script:
-    - meson setup build --cross-file=/usr/share/meson/cross/wasm.ini -Dbuildtype=debug -Dstrict=true -Dwerror=true -Ddefault_library=static -Ddocs=disabled
-    - ninja -C build test
-    - meson configure -Dbuildtype=release build
-    - ninja -C build test
+# Documentation
 
 pages:
   script:
@@ -118,7 +132,7 @@ pages:
     - mv build/doc/html .public/doc/
     - mv .public public
   needs:
-    - x64
+    - dev
   artifacts:
     paths:
      - public