]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
ci: s/multilib/x32/
authorLucas De Marchi <lucas.de.marchi@gmail.com>
Thu, 27 Feb 2025 14:38:19 +0000 (08:38 -0600)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Tue, 4 Mar 2025 21:48:44 +0000 (15:48 -0600)
It's confusing using "multilib" because it's not about adding the
"capability of building 32b", it's rather "this is really building and
testing 32b, which takes different steps.

Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
.github/workflows/main.yml

index defe657686c3777e25f4bf4d938485936c44c5ce..02892f90e17864b91e807dfc2ceebc3a1fd34aca 100644 (file)
@@ -30,10 +30,10 @@ jobs:
             meson_setup: '-Ddocs=false -Db_sanitize=none'
           - compiler: 'gcc'
             container: 'archlinux:multilib-devel'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'gcc'
             container: 'debian:unstable'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'gcc'
             container: 'debian:bullseye-slim'
             meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=enabled -Dtools=true'
@@ -44,24 +44,24 @@ jobs:
             meson_setup: '-Dxz=disabled -Ddlopen=all'
           - compiler: 'gcc'
             container: 'ubuntu:22.04'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'gcc'
             container: 'ubuntu:22.04'
-            multilib: 'true'
+            x32: 'true'
             meson_setup: '-Ddlopen=zstd,zlib'
           - compiler: 'gcc'
             container: 'ubuntu:24.04'
-            multilib: 'true'
+            x32: 'true'
 
           - compiler: 'clang'
             container: 'alpine:latest'
             meson_setup: '-Ddocs=false -Db_sanitize=none'
           - compiler: 'clang'
             container: 'archlinux:multilib-devel'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'clang'
             container: 'debian:unstable'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'clang'
             container: 'fedora:latest'
           - compiler: 'clang'
@@ -69,14 +69,14 @@ jobs:
             meson_setup: '-Dxz=disabled -Ddlopen=all'
           - compiler: 'clang'
             container: 'ubuntu:22.04'
-            multilib: 'true'
+            x32: 'true'
           - compiler: 'clang'
             container: 'ubuntu:22.04'
-            multilib: 'true'
+            x32: 'true'
             meson_setup: '-Ddlopen=zstd,zlib'
           - compiler: 'clang'
             container: 'ubuntu:24.04'
-            multilib: 'true'
+            x32: 'true'
 
     container:
       image: ${{ matrix.container }}
@@ -147,15 +147,15 @@ jobs:
         run: cd build && meson dist
 
       - name: configure (32bit)
-        if: ${{ matrix.multilib == 'true' }}
+        if: ${{ matrix.x32 == 'true' }}
         run: |
           cross_options="-D zstd=disabled -D xz=disabled -D zlib=disabled -D openssl=disabled"
           CC="$CC -m32" meson setup $cross_options build32/
 
       - name: build (32bit)
-        if: ${{ matrix.multilib == 'true' }}
+        if: ${{ matrix.x32 == 'true' }}
         run: cd build32 && meson compile
 
       - name: test (32bit)
-        if: ${{ matrix.multilib == 'true' }}
+        if: ${{ matrix.x32 == 'true' }}
         run: cd build32 && meson test || meson test --verbose