From 49163b72e7101638825e552659f887d86beb6cfb Mon Sep 17 00:00:00 2001 From: Derek Bruening Date: Sat, 13 Jan 2024 15:27:38 -0500 Subject: [PATCH] Attempt to fix missing zlib --- .github/workflows/ci-aarchxx.yml | 1 + .github/workflows/ci-clang.yml | 13 ++++++------- .github/workflows/ci-package.yml | 13 ++++++------- .github/workflows/ci-x86.yml | 11 +++++------ 4 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci-aarchxx.yml b/.github/workflows/ci-aarchxx.yml index f5304f28..bed902b6 100644 --- a/.github/workflows/ci-aarchxx.yml +++ b/.github/workflows/ci-aarchxx.yml @@ -73,6 +73,7 @@ jobs: for i in include lib; do sudo rsync -av ../extract/usr/${i}/arm-linux-gnueabihf/ /usr/arm-linux-gnueabihf/${i}/; done sudo rsync -av ../extract/usr/include/ /usr/arm-linux-gnueabihf/include/ sudo rsync -av ../extract/lib/arm-linux-gnueabihf/ /usr/arm-linux-gnueabihf/lib/ + rm *.deb - name: Run Suite working-directory: ${{ github.workspace }} diff --git a/.github/workflows/ci-clang.yml b/.github/workflows/ci-clang.yml index fd9eb233..f3d048c7 100644 --- a/.github/workflows/ci-clang.yml +++ b/.github/workflows/ci-clang.yml @@ -66,15 +66,14 @@ jobs: sudo apt-get -y install doxygen jsonlint g++-multilib libunwind-dev \ zlib1g zlib1g-dev sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main' - mkdir ../extract - pushd ../extract apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 \ zlib1g:i386 zlib1g-dev:i386 - for i in *.deb; do dpkg-deb -x $i .; done - sudo rsync -av ./usr/lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./usr/include/i386-linux-gnu/ /usr/include/ - popd + mkdir ../extract + for i in *.deb; do dpkg-deb -x $i ../extract; done + sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/ + rm *.deb # Downgrade from cmake 3.20 to avoid 32-bit toolchain problems (DRi#4830). - name: Downgrade cmake diff --git a/.github/workflows/ci-package.yml b/.github/workflows/ci-package.yml index 69cab050..a3574d72 100644 --- a/.github/workflows/ci-package.yml +++ b/.github/workflows/ci-package.yml @@ -65,15 +65,14 @@ jobs: sudo apt-get -y install doxygen jsonlint g++-multilib libunwind-dev \ zlib1g zlib1g-dev sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main' - mkdir ../extract - pushd ../extract apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 \ zlib1g:i386 zlib1g-dev:i386 - for i in *.deb; do dpkg-deb -x $i .; done - sudo rsync -av ./usr/lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./usr/include/i386-linux-gnu/ /usr/include/ - popd + mkdir ../extract + for i in *.deb; do dpkg-deb -x $i ../extract; done + sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/ + rm *.deb # Downgrade from cmake 3.20 to avoid 32-bit toolchain problems (DRi#4830). - name: Downgrade cmake diff --git a/.github/workflows/ci-x86.yml b/.github/workflows/ci-x86.yml index 63502402..5b78ea6b 100644 --- a/.github/workflows/ci-x86.yml +++ b/.github/workflows/ci-x86.yml @@ -71,14 +71,13 @@ jobs: sudo apt-get -y install doxygen jsonlint g++-multilib libunwind-dev \ zlib1g zlib1g-dev sudo add-apt-repository 'deb [arch=i386] http://us.archive.ubuntu.com/ubuntu focal main' - mkdir ../extract - pushd ../extract apt download libunwind8:i386 libunwind-dev:i386 liblzma5:i386 \ zlib1g:i386 zlib1g-dev:i386 - for i in *.deb; do dpkg-deb -x $i .; done - sudo rsync -av ./usr/lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./lib/i386-linux-gnu/ /lib32/ - sudo rsync -av ./usr/include/i386-linux-gnu/ /usr/include/ + mkdir ../extract + for i in *.deb; do dpkg-deb -x $i ../extract; done + sudo rsync -av ../extract/usr/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/lib/i386-linux-gnu/ /usr/lib/i386-linux-gnu/ + sudo rsync -av ../extract/usr/include/i386-linux-gnu/ /usr/include/ popd # Downgrade from cmake 3.20 to avoid 32-bit toolchain problems (DRi#4830).