Skip to content

Commit

Permalink
Attempt to fix missing zlib
Browse files Browse the repository at this point in the history
  • Loading branch information
derekbruening committed Jan 13, 2024
1 parent 1127fb4 commit 49163b7
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci-aarchxx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/ci-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/ci-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/ci-x86.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down

0 comments on commit 49163b7

Please sign in to comment.