From f613bd1279db3d00d50d4c19ee28f3f7efa35e23 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 5 Jan 2024 16:47:48 +0000
Subject: [PATCH] Update config.yml

---
 .circleci/config.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3fdf1facb..68480ae91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /home/circleci/SRB2
     docker:
-      - image: cimg/base:current
+      - image: cimg/base:edge
         environment:
           CC: ccache gcc -m32
           PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
@@ -30,9 +30,7 @@ jobs:
           name: Add STJr PPA
           command: |
             sudo apt-get -qq update
-            sudo apt-get -qq -y install dirmngr
-            sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0B1702D71499D9C25F986507F240F4449D3B0EC6
-            echo "deb http://ppa.launchpad.net/stjr/srb2/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
+            sudo apt-get -qq install apt-utils
       - run:
           name: Make APT cache folder
           command: mkdir -p /home/circleci/.cache/apt/archives/partial
@@ -53,7 +51,7 @@ jobs:
          command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends remove libcurl4-openssl-dev:amd64
       - run:
           name: Install i386 SDK
-          command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends install git build-essential libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 gettext ccache wget gcc-multilib upx openssh-client 
+          command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends install git build-essential libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 libcurl4-openssl-dev:i386 libopenmpt-dev:i386 libminiupnpc-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
       - run:
           name: make md5sum
           command: sudo find /home/circleci/.cache/apt/archives -type f -print0 | sort -z | sudo xargs -r0 md5sum > /home/circleci/.cache/apt_archives.md5
@@ -64,13 +62,13 @@ jobs:
       - checkout
       - run:
           name: Compile without network support
-          command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 NOUPNP=1 -j4
+          command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1 -j4
       - run:
           name: wipe build
-          command: make -C src LINUX=1 NOUPNP=1 cleandep
+          command: make -C src LINUX=1 cleandep
       - run:
           name: rebuild depend
-          command: make -C src LINUX=1 NOUPNP=1 clean
+          command: make -C src LINUX=1 clean
       - run:
           name: make master depend file
           command: find make/linux/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux/SDL.deps
@@ -79,7 +77,7 @@ jobs:
             - v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/SDL.deps" }}
       - run:
           name: Compile
-          command: make -C src LINUX=1 ERRORMODE=1 NOUPNP=1 -k -j4
+          command: make -C src LINUX=1 ERRORMODE=1 -k -j4
       - store_artifacts:
           path: /home/circleci/SRB2/bin/
           destination: bin