From 67710d905e6a7ad66feb9b24f093085da26dde0d Mon Sep 17 00:00:00 2001 From: Jj0YzL5nvJ Date: Sun, 21 May 2023 22:40:10 -0600 Subject: [PATCH] CI/CD: Fixes Ubuntu i386 builds, among other changes --- .github/workflows/build.yml | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57489b7..47e8e8a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,32 +44,23 @@ jobs: echo "G_REV=$(git rev-parse --short HEAD)" >> "${GITHUB_ENV}" if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo dpkg --add-architecture i386; fi sudo apt-get update - sudo apt-get -y install libgl1-mesa-dev libglew-dev libsdl1.2-dev libsdl2-dev + sudo apt-get -y install libgl1-mesa-dev libglew-dev libglu1-mesa-dev libsdl1.2-dev libsdl2-dev libx11-dev if [[ ${{ matrix.bits }} -eq 32 ]]; then - sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libgl1-mesa-glx:i386 libglu1-mesa:i386 libsdl1.2debian:i386 libsdl2-2.0-0:i386 libx11-6:i386 + sudo apt-get --reinstall -y install gcc-multilib g++-multilib libc6 libc6-dev-i386 libatomic1:i386 libgcc-s1:i386 libstdc++6:i386 libgl1-mesa-dev:i386 libglu1-mesa-dev:i386 libsdl1.2-dev:i386 libsdl2-dev:i386 libx11-dev:i386 echo "" - echo "NOTE: There is no native \"libglew2.2:i386\" in Ubuntu 22.04, we will use Debian ones..." + echo "NOTE: There is no native \"libglew-dev:i386\" in Ubuntu 22.04, we will use Debian ones..." echo "" DEBSOURCE="http://http.us.debian.org/debian/pool/main/g/glew/" PKGVER_LS="$(curl -sS ${DEBSOURCE} | grep 'dev_2.2' | grep 'amd64' | cut -d '_' -f2 | sort)" if [[ "${PKGVER_LS}" != "" ]]; then for VER in ${PKGVER_LS}; do PKGVER="${VER}"; done cd /tmp - curl -L -O "${DEBSOURCE}libglew-dev_${PKGVER}_amd64.deb" - curl -L -O "${DEBSOURCE}libglew2.2_${PKGVER}_amd64.deb" - curl -L -O "${DEBSOURCE}libglew2.2_${PKGVER}_i386.deb" + for DEB in libglew-dev libglew2.2; do + curl -L -O "${DEBSOURCE}${DEB}_${PKGVER}_amd64.deb" + curl -L -O "${DEBSOURCE}${DEB}_${PKGVER}_i386.deb" + done sudo dpkg -i libglew*${PKGVER}*.deb fi - LINK="sudo ln -s -T" - cd /usr/lib/i386-linux-gnu - if ! [[ -f libGL.so ]]; then ${LINK} libGL.so.1.7.0 libGL.so; fi - if ! [[ -f libGLEW.so ]]; then ${LINK} libGLEW.so.2.2.0 libGLEW.so; fi - if ! [[ -f libGLU.so ]]; then ${LINK} libGLU.so.1.3.1 libGLU.so; fi - 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 - if ! [[ -f libX11.so ]]; then ${LINK} libX11.so.6.4.0 libX11.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 sudo ldconfig - name: Build and related stuff, backup binaries @@ -217,9 +208,11 @@ jobs: tigerdeep -lz ${BIN} >> ../${BIN:0:21}.tiger.txt sha256sum ${BIN} >> ../${BIN:0:21}.sha256.txt sha512sum ${BIN} >> ../${BIN:0:21}.sha512.txt + b2sum ${BIN} >> ../${BIN:0:21}.blake2.txt done mv ../*.tiger.txt . mv ../*.sha*.txt . + mv ../*.blake2.txt . echo "" echo "TIGER:" cat *.tiger.txt @@ -230,6 +223,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