From: Lucas De Marchi <lucas.de.marchi@gmail.com>
Date: Wed, 12 Mar 2025 15:53:45 +0000 (-0500)
Subject: ci: Drop container objects for other workflows
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a418918d7a55c40d76c942c7c148e2513dc7aad7;p=thirdparty%2Fkmod.git

ci: Drop container objects for other workflows

Commit 23b45fc385c7 ("ci: Drop container object") dropped the container
object for the main workflow. Do the same for the other workflows.
Even if they don't need a matrix (since they run in just one
configuration), keep using it to make the structure common to all
workflows.

Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/321
---

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 885323e1..a9b2cb15 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -27,12 +27,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container:
-          - name: 'ubuntu:24.04'
+        include:
+          - container: 'ubuntu:24.04'
             meson_setup: '-D b_sanitize=none -D build-tests=false'
 
     container:
-      image: ${{ matrix.container.name }}
+      image: ${{ matrix.container }}
 
     steps:
       - name: Sparse checkout the local actions
@@ -63,7 +63,7 @@ jobs:
       - name: Build
         run: |
           mkdir build && cd build
-          meson setup --native-file ../build-dev.ini ${{ matrix.container.meson_setup }} . ..
+          meson setup --native-file ../build-dev.ini ${{ matrix.meson_setup }} . ..
           meson compile
 
       - name: Perform CodeQL Analysis
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 72a6d5ec..c0564199 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -20,15 +20,16 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-24.04
+
     strategy:
       fail-fast: false
       matrix:
-        container:
-          - name: 'ubuntu:24.04'
+        include:
+          - container: 'ubuntu:24.04'
             meson_setup: '-D b_sanitize=none -D b_coverage=true'
 
     container:
-      image: ${{ matrix.container.name }}
+      image: ${{ matrix.container }}
 
     steps:
       - name: Sparse checkout the local actions
@@ -53,7 +54,7 @@ jobs:
       - name: Build
         run: |
           mkdir build && cd build
-          meson setup --native-file ../build-dev.ini ${{ matrix.container.meson_setup }} . ..
+          meson setup --native-file ../build-dev.ini ${{ matrix.meson_setup }} . ..
           meson compile
           meson test
           ninja coverage-xml