From 433a5cc8ed236aa02c3a8e4b55f4dc9140dd98c8 Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 30 May 2023 14:57:46 +0200 Subject: [PATCH] workflows.yaml: Fix Github Actions on i386 - build i386 was failing due missing dependencies - libgcc-s1:i386 and libstdc++6:i386 - use ubuntu-latest, so we automatically use the latest stable, but print out the pretty name in workflow to show which version it is (dont wanna to look up the names :)) - update the image before testing --- .github/workflows/build.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e63f8e7350..1ae66b373b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,12 +9,14 @@ on: jobs: build-linux: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - name: show Ubuntu version + run: cat /etc/os-release | grep PRETTY_NAME | awk -F '=' '{print $2}' - name: update build environment - run: sudo apt-get update --fix-missing -y + run: sudo apt-get update --fix-missing -y && sudo apt-get upgrade --fix-missing -y - name: install prerequisites run: sudo apt-get install -y avahi-daemon libavahi-client-dev libssl-dev libpam-dev libusb-1.0-0-dev zlib1g-dev - name: configure @@ -28,16 +30,18 @@ jobs: build-linux-i386: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - 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 + run: sudo apt-get update --fix-missing -y && sudo apt-get upgrade --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 + 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 env: CC: /usr/bin/i686-linux-gnu-gcc -- 2.47.2