From: Lucas De Marchi <lucas.de.marchi@gmail.com>
Date: Thu, 27 Feb 2025 06:36:33 +0000 (-0600)
Subject: ci: Use include to completly specify the matrix
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=975638c91d870d8f4fdbcc56d686cd18e8c12465;p=thirdparty%2Fkmod.git

ci: Use include to completly specify the matrix

The permutation available in github and extending it "include" or
reducing it with "exclude" are much harder than needed. It doesn't seem
we can have a mix of "properties" with the configurations. Just give up
and completly specify the matrix. Now that there's only 1 build system,
at least doing all the permutations doesn't make it too big.

Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
---

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 524fdc75..7d0d1008 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,24 +24,72 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: ['clang','gcc']
-        container:
-          - name: 'alpine:latest'
-            meson_setup: '-D docs=false -D b_sanitize=none'
-          - name: 'archlinux:multilib-devel'
-            multilib: 'true'
-          - name: 'debian:unstable'
-            multilib: 'true'
-          - name: 'fedora:latest'
-          - name: 'fedora:latest'
-            meson_setup: '-D xz=disabled -D dlopen=all'
-          - name: 'ubuntu:22.04'
-            multilib: 'true'
-          - name: 'ubuntu:22.04'
-            multilib: 'true'
-            meson_setup: '-D dlopen=zstd,zlib'
-          - name: 'ubuntu:24.04'
-            multilib: 'true'
+        include:
+          - compiler: 'gcc'
+            container:
+              name: 'alpine:latest'
+              meson_setup: '-Ddocs=false -Db_sanitize=none'
+          - compiler: 'gcc'
+            container:
+              name: 'archlinux:multilib-devel'
+              multilib: 'true'
+          - compiler: 'gcc'
+            container:
+              name: 'debian:unstable'
+              multilib: 'true'
+          - compiler: 'gcc'
+            container:
+              name: 'fedora:latest'
+          - compiler: 'gcc'
+            container:
+              name: 'fedora:latest'
+              meson_setup: '-Dxz=disabled -Ddlopen=all'
+          - compiler: 'gcc'
+            container:
+              name: 'ubuntu:22.04'
+              multilib: 'true'
+          - compiler: 'gcc'
+            container:
+              name: 'ubuntu:22.04'
+              multilib: 'true'
+              meson_setup: '-Ddlopen=zstd,zlib'
+          - compiler: 'gcc'
+            container:
+              name: 'ubuntu:24.04'
+              multilib: 'true'
+
+          - compiler: 'clang'
+            container:
+              name: 'alpine:latest'
+              meson_setup: '-Ddocs=false -Db_sanitize=none'
+          - compiler: 'clang'
+            container:
+              name: 'archlinux:multilib-devel'
+              multilib: 'true'
+          - compiler: 'clang'
+            container:
+              name: 'debian:unstable'
+              multilib: 'true'
+          - compiler: 'clang'
+            container:
+              name: 'fedora:latest'
+          - compiler: 'clang'
+            container:
+              name: 'fedora:latest'
+              meson_setup: '-Dxz=disabled -Ddlopen=all'
+          - compiler: 'clang'
+            container:
+              name: 'ubuntu:22.04'
+              multilib: 'true'
+          - compiler: 'clang'
+            container:
+              name: 'ubuntu:22.04'
+              multilib: 'true'
+              meson_setup: '-Ddlopen=zstd,zlib'
+          - compiler: 'clang'
+            container:
+              name: 'ubuntu:24.04'
+              multilib: 'true'
 
     container:
       image: ${{ matrix.container.name }}