From c6cacb9b9e1c4c78b06e29a247cf54c37301ec9b Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Fri, 6 Jun 2025 10:10:15 +0200 Subject: [PATCH] Enable the GNUTLS build for now --- .github/workflows/build.yml | 48 ++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4cf1a7416..57cda40ab8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,30 +34,30 @@ jobs: - name: Test CUPS run: make test || cat test/error_log* -# build-linux-i386: -# -# runs-on: ubuntu-latest -# -# steps: -# - name: Checkout CUPS sources -# 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 -# - 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 -# - name: Build CUPS -# run: make -# - name: Test CUPS -# run: make test || cat test/error_log* + build-linux-i386: + + runs-on: ubuntu-latest + + steps: + - name: Checkout CUPS sources + 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 + - 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 + - name: Build CUPS + run: make + - name: Test CUPS + run: make test || cat test/error_log* build-macos: -- 2.47.2