ci: Switch most builds to 64b

Due to a mistake on using "multilib" fixed in commit
271d8ab ("ci: Fix 32b build ignoring options") and commit
6897912 ("ci: s/multilib/x32/"), most of our builds were actually
testing 32b, which is not the most common thing.

Leave just 2 32b builds, one with Archlinux and the other with Ubuntu
and remove the FIXME about configuration.

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

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1189299e97368a1d698ccfd0ee09c69752fb38ca..20f298d80897e29fda14ebde104c347f702c86dc 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,14 +30,8 @@ jobs:
             meson_setup: '-Ddocs=false -Db_sanitize=none'
           - compiler: 'gcc'
             container: 'archlinux:multilib-devel'
-          - compiler: 'gcc'
-            container: 'archlinux:multilib-devel'
-            x32: 'true'
-            # for x32, fails on LD_PRELOAD
-            skip_test: 'true'
           - compiler: 'gcc'
             container: 'debian:unstable'
-            x32: 'true'
           - compiler: 'gcc'
             container: 'debian:bullseye-slim'
             meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=enabled -Dtools=true'
@@ -48,28 +42,25 @@ jobs:
             meson_setup: '-Dxz=disabled -Ddlopen=all'
           - compiler: 'gcc'
             container: 'ubuntu:22.04'
-            x32: 'true'
           - compiler: 'gcc'
             container: 'ubuntu:22.04'
-            x32: 'true'
             meson_setup: '-Ddlopen=zstd,zlib'
           - compiler: 'gcc'
             container: 'ubuntu:24.04'
-            x32: 'true'
+
+          # clang variations of the same builds
 
           - compiler: 'clang'
             container: 'alpine:latest'
             meson_setup: '-Ddocs=false -Db_sanitize=none'
           - compiler: 'clang'
             container: 'archlinux:multilib-devel'
-          - compiler: 'clang'
-            container: 'archlinux:multilib-devel'
-            # for x32, fails on LD_PRELOAD
-            skip_test: 'true'
-            x32: 'true'
           - compiler: 'clang'
             container: 'debian:unstable'
-            x32: 'true'
+          # Disabled because it doesn't work
+          # - compiler: 'clang'
+          #   container: 'debian:bullseye-slim'
+          #   meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=enabled -Dtools=true'
           - compiler: 'clang'
             container: 'fedora:latest'
           - compiler: 'clang'
@@ -77,14 +68,34 @@ jobs:
             meson_setup: '-Dxz=disabled -Ddlopen=all'
           - compiler: 'clang'
             container: 'ubuntu:22.04'
-            x32: 'true'
           - compiler: 'clang'
             container: 'ubuntu:22.04'
-            x32: 'true'
             meson_setup: '-Ddlopen=zstd,zlib'
+          - compiler: 'clang'
+            container: 'ubuntu:24.04'
+
+          # Test some configurations with 32bits
+
+          - compiler: 'gcc'
+            container: 'archlinux:multilib-devel'
+            x32: 'true'
+            meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled'
+            # fails on LD_PRELOAD
+            skip_test: 'true'
+          - compiler: 'gcc'
+            container: 'ubuntu:24.04'
+            x32: 'true'
+            meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled'
+          - compiler: 'clang'
+            container: 'archlinux:multilib-devel'
+            x32: 'true'
+            meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled'
+            # fails on LD_PRELOAD
+            skip_test: 'true'
           - compiler: 'clang'
             container: 'ubuntu:24.04'
             x32: 'true'
+            meson_setup: '-Dzstd=disabled -Dxz=disabled -Dzlib=disabled -Dopenssl=disabled'
 
     container:
       image: ${{ matrix.container }}
@@ -145,8 +156,6 @@ jobs:
 
           if [[ "${{ matrix.x32 }}" == "true" ]]; then
             export CC="$CC -m32"
-            # FIXME: we shouldn't need to override and let it per configuration
-            setup_options+=" -D zstd=disabled -D xz=disabled -D zlib=disabled -D openssl=disabled"
           fi
 
           meson setup --native-file build-dev.ini $setup_options build