From 8248b1224e993ded140c1d5660f0a004580d519e Mon Sep 17 00:00:00 2001
From: Alexandria | Aster <92374839+lexiwitch@users.noreply.github.com>
Date: Wed, 13 Nov 2024 16:04:22 +0000
Subject: [PATCH 1/2] Update upload-artifact version

Old version is deprecated and was causing build failure
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fdc81026f4..e25b88305c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
       run: ./editbin.exe /largeaddressaware ${{runner.workspace}}/build/${{ matrix.build_type }}/mbii.x86.exe
 
     - name: Upload Build
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: Windows Build ${{ matrix.build_type }}
         path: |
@@ -90,7 +90,7 @@ jobs:
         mv codemp/rd-rend2/rd-rend2-mbii_i386.so .
       
     - name: Upload Build
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: Linux Client Build ${{ matrix.build_type }}
         path: |
@@ -126,7 +126,7 @@ jobs:
       run: cmake --build .
       
     - name: Upload Build
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: Linux Server Build ${{ matrix.build_type }}
         path: ${{runner.workspace}}/build/*.i386

From 226482175bb1a3b8aeb1518c9b3b0c2c565581b7 Mon Sep 17 00:00:00 2001
From: Alexandria | Aster <92374839+lexiwitch@users.noreply.github.com>
Date: Wed, 13 Nov 2024 16:02:04 +0000
Subject: [PATCH 2/2] Shift build into container

The runner environment of ubuntu is severely neutered and attempting to
use the i386 repositories immediately causes dependency hell.

This resolves that by relying on the docker ubuntu 20.04 image.

In full, the changes are:

- Specify container to run in.
- Set environment variables `DEBIAN_FRONTEND` and `TZ`
Without this change, the package installation process will wait asking
for input forever (TZ because there's an indirect dependency on tzdata).
- Mount the location of the code (github.workspace) to /data in the
  container
- Alter references to github.workspace to reference the location it is
  mounted to in the container.
---
 .github/workflows/build.yml | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e25b88305c..9a24244629 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,14 @@ jobs:
 
   linux:
     name: Build Linux Client, ${{ matrix.build_type }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:20.04
+      env:
+        DEBIAN_FRONTEND: noninteractive
+        TZ: Etc/Utc
+      volumes:
+        - ${{ github.workspace }}:/data
     strategy:
       matrix:
         build_type: [Release]
@@ -65,23 +72,23 @@ jobs:
 
     - name: Create Build Environment
       run: |
-        sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install build-essential cmake gcc-multilib g++-multilib libjpeg-dev:i386 libpng-dev:i386 zlib1g-dev:i386 libsdl2-dev:i386
-        cmake -E make_directory ${{runner.workspace}}/build
+        dpkg --add-architecture i386
+        apt-get update
+        apt-get install -y build-essential cmake gcc-multilib g++-multilib libjpeg-dev:i386 libpng-dev:i386 zlib1g-dev:i386 libsdl2-dev:i386
+        cmake -E make_directory /data/build
         
     - name: Configure CMake
       shell: bash
-      working-directory: ${{runner.workspace}}/build
+      working-directory: /data/build
       run: >
-        cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
         -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/linux-i686.cmake
         -DBuildMPDed=OFF -DBuildMPEngine=ON -DBuildMPRdVanilla=ON -DBuildMPCGame=OFF
         -DBuildMPUI=OFF -DBuildSPEngine=OFF -DBuildSPGame=OFF -DBuildSPRdVanilla=OFF
         -DUseInternalPNG=ON -DUseInternalJPEG=ON -DBuildMPRdVulkan=ON -DBuildMPRend2=ON
 
     - name: Build
-      working-directory: ${{runner.workspace}}/build
+      working-directory: /data/build
       shell: bash
       run: |
         cmake --build .
@@ -94,8 +101,8 @@ jobs:
       with:
         name: Linux Client Build ${{ matrix.build_type }}
         path: |
-          ${{runner.workspace}}/build/*.i386
-          ${{runner.workspace}}/build/*.so
+          /data/build/*.i386
+          /data/build/*.so
 
   linux-old:
     name: Build Linux Server, ${{ matrix.build_type }}