Merge pull request #125 from Jj0YzL5nvJ/up2023

CI/CD: Fixes Ubuntu i386 builds, among other changes
mupen64plus · Jun 11, 2023 · d900f21 · d900f21
2 parents 497a825 + 5fb3193
commit d900f21
Showing 1 changed file with 7 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -44,21 +44,8 @@ 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 libboost-filesystem-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 libboost-filesystem1.74.0:i386 libboost-system1.74.0: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 libboost_filesystem.so ]]; then ${LINK} libboost_filesystem.so.1.74.0 libboost_filesystem.so; fi
-            if ! [[ -f libboost_system.so ]]; then ${LINK} libboost_system.so.1.74.0 libboost_system.so; fi
-            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
+          sudo apt-get -y install libgl1-mesa-dev libboost-filesystem-dev libboost-system-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 libatomic1:i386 libgcc-s1:i386 libgomp1:i386 libitm1:i386 libquadmath0:i386 libstdc++6:i386 libubsan1:i386 libgl1-mesa-dev:i386 libboost-filesystem-dev:i386 libboost-system-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: |
@@ -257,9 +244,11 @@ jobs:
             tigerdeep -lz ${BIN} >> ../${BIN:0:28}.tiger.txt
             sha256sum ${BIN} >> ../${BIN:0:28}.sha256.txt
             sha512sum ${BIN} >> ../${BIN:0:28}.sha512.txt
+            b2sum ${BIN} >> ../${BIN:0:28}.blake2.txt
           done
           mv ../*.tiger.txt .
           mv ../*.sha*.txt .
+          mv ../*.blake2.txt .
           echo ""
           echo "TIGER:"
           cat *.tiger.txt
@@ -270,6 +259,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