Skip to content

Commit 39b981b

Browse files
committed
Stop building i386 for CUPS 2.5, but keep testing GNU TLS.
1 parent 4c66e5d commit 39b981b

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

.github/workflows/build.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Test CUPS
3535
run: make test || (cat cups/test.log; test -f test/error_log && cat test/error_log*)
3636

37-
build-linux-i386:
37+
build-linux-gnutls:
3838

3939
runs-on: ubuntu-latest
4040

@@ -43,17 +43,15 @@ jobs:
4343
uses: actions/checkout@v4
4444
- name: Show Ubuntu version
4545
run: cat /etc/os-release | grep PRETTY_NAME | awk -F '=' '{print $2}'
46-
- name: Setup multiarch for i386
47-
run: sudo dpkg --add-architecture i386
4846
- name: Update build environment
4947
run: sudo apt-get update --fix-missing -y
5048
- name: Install prerequisites
51-
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
49+
run: sudo apt-get install -y avahi-daemon libavahi-client-dev libgnutls28-dev libpam-dev libusb-1.0-0-dev zlib1g-dev
5250
- name: Configure CUPS
5351
env:
54-
CC: /usr/bin/i686-linux-gnu-gcc
55-
CXX: /usr/bin/i686-linux-gnu-g++
56-
run: ./configure --enable-debug --enable-maintainer --host=i686-pc-linux-gnu --target=i686-pc-linux-gnu --with-tls=gnutls
52+
CC: /usr/bin/gcc
53+
CXX: /usr/bin/g++
54+
run: ./configure --enable-debug --enable-maintainer --with-tls=gnutls
5755
- name: Build CUPS
5856
run: make
5957
- name: Test CUPS

0 commit comments

Comments
 (0)