From: Michael R Sweet <msweet@msweet.org>
Date: Sat, 30 Aug 2025 13:34:19 +0000 (-0400)
Subject: Stop building i386 for CUPS 2.5, but keep testing GNU TLS.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39b981b8774a77bec38290f7aafb80a43716e209;p=thirdparty%2Fcups.git

Stop building i386 for CUPS 2.5, but keep testing GNU TLS.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 49461d037f..2e0e8c8e52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Test CUPS
       run: make test || (cat cups/test.log; test -f test/error_log && cat test/error_log*)
 
-  build-linux-i386:
+  build-linux-gnutls:
 
     runs-on: ubuntu-latest
 
@@ -43,17 +43,15 @@ jobs:
       uses: actions/checkout@v4
     - name: Show Ubuntu version
       run: cat /etc/os-release | grep PRETTY_NAME | awk -F '=' '{print $2}'
-    - name: Setup multiarch for i386
-      run: sudo dpkg --add-architecture i386
     - name: Update build environment
       run: sudo apt-get update --fix-missing -y
     - name: Install prerequisites
-      run: sudo apt-get install -y avahi-daemon libavahi-client-dev libavahi-client-dev:i386 libgnutls28-dev libgnutls28-dev:i386 libpam-dev libpam-dev:i386 libusb-1.0-0-dev libusb-1.0-0-dev:i386 zlib1g-dev zlib1g-dev:i386 crossbuild-essential-i386 libgcc-s1:i386 libstdc++6:i386
+      run: sudo apt-get install -y avahi-daemon libavahi-client-dev libgnutls28-dev libpam-dev libusb-1.0-0-dev zlib1g-dev
     - name: Configure CUPS
       env:
-        CC: /usr/bin/i686-linux-gnu-gcc
-        CXX: /usr/bin/i686-linux-gnu-g++
-      run: ./configure --enable-debug --enable-maintainer --host=i686-pc-linux-gnu --target=i686-pc-linux-gnu --with-tls=gnutls
+        CC: /usr/bin/gcc
+        CXX: /usr/bin/g++
+      run: ./configure --enable-debug --enable-maintainer --with-tls=gnutls
     - name: Build CUPS
       run: make
     - name: Test CUPS