From 7ad8b3a983502e368872479465143776d3bd889f Mon Sep 17 00:00:00 2001
From: Jj0YzL5nvJ <reizemberk@gmail.com>
Date: Sun, 21 May 2023 23:33:15 -0600
Subject: [PATCH] CI/CD: Fixes Ubuntu i386 builds, among other changes

---
 .github/workflows/build.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f1c913..ce4ddb1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -45,18 +45,7 @@ jobs:
           if [[ ${{ matrix.bits }} -eq 32 ]]; then sudo dpkg --add-architecture i386; fi
           sudo apt-get update
           sudo apt-get -y install libgl1-mesa-dev libpng-dev libsdl1.2-dev libsdl2-dev zlib1g-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 libpng16-16:i386 libsdl1.2debian:i386 libsdl2-2.0-0:i386 zlib1g:i386
-            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 libpng16.so ]]; then ${LINK} libpng16.so.16.37.0 libpng16.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 libz.so ]]; then ${LINK} libz.so.1.2.11 libz.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 libgl1-mesa-dev:i386 libpng-dev:i386 libsdl1.2-dev:i386 libsdl2-dev:i386 zlib1g-dev:i386; fi
           sudo ldconfig
       - name: Build and related stuff, backup binaries
         run: |
@@ -254,9 +243,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
@@ -267,6 +258,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