From b6e42e6e48ccfafc3c2233670e61a991480dde30 Mon Sep 17 00:00:00 2001
From: lukas schwerdtfeger <lukas.schwerdtfeger@gmail.com>
Date: Thu, 18 Apr 2024 20:37:05 +0200
Subject: [PATCH] Remove Ubuntu 18

---
 .github/workflows/build.yml    |  5 +----
 docker/Dockerfile-ubuntu-18.04 | 30 ------------------------------
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 docker/Dockerfile-ubuntu-18.04

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 089956b..29fff02 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,9 +14,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - osversion: ubuntu-18.04
-            arch: "x64"
-            force_system_binary: 0
           - osversion: ubuntu-20.04
             arch: "x64"
             force_system_binary: 0
@@ -164,4 +161,4 @@ jobs:
         run: |
           rm -rf nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-nes \
           nes-dependencies-${{ steps.vars.outputs.tag }}-${{ env.VCPKG_DEP_LIST }}-${{ matrix.osversion }}-nes.7z \
-          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
\ No newline at end of file
+          ${{ github.workspace }}/vcpkg/{buildtrees,downloads,packages}
diff --git a/docker/Dockerfile-ubuntu-18.04 b/docker/Dockerfile-ubuntu-18.04
deleted file mode 100644
index e0978bd..0000000
--- a/docker/Dockerfile-ubuntu-18.04
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ubuntu:18.04
-
-RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -qq \
-  git \
-  wget \
-  python3 \
-  python3-venv \
-  python \
-  tar \
-  p7zip-full \
-  cmake \
-  software-properties-common \
-  build-essential \
-  curl zip unzip tar \  
-  pkg-config \
-  autoconf \
-  cmake \
-  ninja-build \
-  flex \
-  bison \
-  && apt-get clean -qq
-
-RUN cd ${HOME} && wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null \
-    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' \
-    && apt update && apt install -y kitware-archive-keyring && rm /etc/apt/trusted.gpg.d/kitware.gpg && apt update && apt install -y cmake
-
-
-ADD ./entrypoint-build.sh /entrypoint.sh
-
-ENTRYPOINT ["/entrypoint.sh"]