From 84525032e37053e1334b4979a4a9b40956714933 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 14 May 2023 11:03:43 -0400
Subject: [PATCH] CI fixes and updates

- Switch away from apt-get
- Use -f to fix libc issues
- Bump CI BYOND to 1606
---
 .github/workflows/ci-suite.yml | 16 ++++++++--------
 build/Dockerfile               |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml
index bb514afdd41..f6587becad7 100644
--- a/.github/workflows/ci-suite.yml
+++ b/.github/workflows/ci-suite.yml
@@ -103,14 +103,14 @@ jobs:
     if: "!(cancelled() || failure()) && needs.start-ci-run-gate.result == 'success'"
     env:
       BYOND_MAJOR: 515
-      BYOND_MINOR: 1592
-    runs-on: ubuntu-latest
+      BYOND_MINOR: 1606
+    runs-on: ubuntu-20.04
     steps:
     - name: Install x86 libc Dependencies
       run: |
         sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386
+        sudo apt update
+        sudo apt -f install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386
 
     - name: Install BYOND
       if: steps.cache-byond.outputs.cache-hit != 'true'
@@ -435,8 +435,8 @@ jobs:
     - name: Install Native Dependencies
       run: |
         sudo dpkg --add-architecture i386
-        sudo apt-get update
-        sudo apt-get install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 gdb
+        sudo apt update
+        sudo apt -f install -y -o APT::Immediate-Configure=0 libc6-i386 libstdc++6:i386 gdb
 
     - name: Install Node 12.X
       uses: actions/setup-node@v3
@@ -959,8 +959,8 @@ jobs:
 
     - name: Parse TGS version
       run: |
-        sudo apt-get update
-        sudo apt-get install -y xmlstarlet
+        sudo apt update
+        sudo apt install -y xmlstarlet
         echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV
 
     - name: Docker Build and Push
diff --git a/build/Dockerfile b/build/Dockerfile
index a48a345099d..cd443a84adc 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -13,8 +13,8 @@ ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
 RUN . $NVM_DIR/nvm.sh \
     && nvm install $NODE_VERSION \
 	&& nvm use $NODE_VERSION \
-	&& apt-get update \
-	&& apt-get install -y \
+	&& apt update \
+	&& apt install -y \
 		dos2unix \
 	&& rm -rf /var/lib/apt/lists/* \
 	&& npm install -g npm
@@ -61,8 +61,8 @@ RUN dotnet publish -c Release -o /app/lib/Default && mv /app/lib/Default/appsett
 FROM mcr.microsoft.com/dotnet/aspnet:6.0-bullseye-slim
 
 #needed for byond
-RUN apt-get update \
-	&& apt-get install -y \
+RUN apt update \
+	&& apt install -y \
 		gcc-multilib \
 		gdb \
 		curl \