CI/CD: Fixes Ubuntu i386 builds, among other changes

This commit is contained in:
Jj0YzL5nvJ 2023-05-22 01:13:29 -06:00
parent 1340c4bdfc
commit 11720558ab

View file

@ -45,15 +45,7 @@ jobs:
if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo dpkg --add-architecture i386; fi
sudo apt-get update
sudo apt-get -y install libsdl1.2-dev libsdl2-dev
if [[ ${{ matrix.bits }} -eq 32 ]]; then
sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libsdl1.2debian:i386 libsdl2-2.0-0:i386
LINK="sudo ln -s -T"
cd /usr/lib/i386-linux-gnu
if ! [[ -f libSDL.so ]]; then ${LINK} libSDL-1.2.so.0.11.4 libSDL.so; fi
if ! [[ -f libSDL2.so ]]; then ${LINK} libSDL2-2.0.so.0.18.2 libSDL2.so; fi
cd /usr/include/SDL2
if ! [[ -f _real_SDL_config.h ]]; then ${LINK} ../x86_64-linux-gnu/SDL2/_real_SDL_config.h _real_SDL_config.h; fi
fi
if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libatomic1:i386 libgcc-s1:i386 libstdc++6:i386 libsdl1.2-dev:i386 libsdl2-dev:i386; fi
sudo ldconfig
- name: Build and related stuff, backup binaries
run: |
@ -246,9 +238,11 @@ jobs:
tigerdeep -lz ${BIN} >> ../${BIN:0:22}.tiger.txt
sha256sum ${BIN} >> ../${BIN:0:22}.sha256.txt
sha512sum ${BIN} >> ../${BIN:0:22}.sha512.txt
b2sum ${BIN} >> ../${BIN:0:22}.blake2.txt
done
mv ../*.tiger.txt .
mv ../*.sha*.txt .
mv ../*.blake2.txt .
echo ""
echo "TIGER:"
cat *.tiger.txt
@ -259,6 +253,9 @@ jobs:
echo "SHA512:"
cat *.sha512.txt
echo ""
echo "BLAKE2:"
cat *.blake2.txt
echo ""
git tag -f nightly-build
git push -f origin nightly-build
- name: Nightly-build