From 0034b5de6feb2488cc3d5e5848c2eade1869d766 Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sun, 15 Feb 2026 08:36:36 +0000
Subject: [PATCH 1/2] Fix sdl3 build

---
 .github/workflows/ci.yml |  2 +-
 11/noble/Dockerfile      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1bd0117..4d76c4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         # Remember if you commit this, newly built images will replace those tags.
         # Prefer incrementing the version to unused one
-        tag: [11-mingw32, 11-jammy, 11-jammy32, 11-noble, 11-noble32, 11-noblevcpkg]
+        tag: [11-mingw32, 11-noble, 11-noble32, 11-noblevcpkg]
     env:
       dockertag: ${{ matrix.tag }}
       REGISTRY: ghcr.io
diff --git a/11/noble/Dockerfile b/11/noble/Dockerfile
index d1867ee..e89d15a 100644
--- a/11/noble/Dockerfile
+++ b/11/noble/Dockerfile
@@ -16,8 +16,16 @@ RUN apt-get update \
         libtbb-dev \
         libopenal-dev \
         libpng-dev \
-        libsdl3-dev \
         ninja-build \
         pkg-config \
     && update-ca-certificates \
     && rm -rf /var/lib/apt/lists/*
+RUN git clone --depth=1 https://github.com/libsdl-org/SDL.git \
+    && cd SDL \
+    && git checkout a962f40bbba175e9716557a25d5d7965f134a3d3 \
+    && mkdir build \
+    && cd build \
+    && cmake .. \
+    && cmake --build . \
+    && cmake --install .
+

From 7ad067d5c365beb6da82cf5797136289b1ceb4be Mon Sep 17 00:00:00 2001
From: duncanspumpkin <duncans_pumpkin@hotmail.co.uk>
Date: Sun, 15 Feb 2026 08:49:56 +0000
Subject: [PATCH 2/2] Just ditch 24.04

---
 .github/workflows/ci.yml                        |  2 +-
 11/{noble32 => ubuntu26.04.32}/Dockerfile       |  2 +-
 11/{noblevcpkg => ubuntu26.04.vcpkg}/Dockerfile |  2 +-
 11/{noble => ubuntu26.04}/Dockerfile            | 11 ++---------
 4 files changed, 5 insertions(+), 12 deletions(-)
 rename 11/{noble32 => ubuntu26.04.32}/Dockerfile (96%)
 rename 11/{noblevcpkg => ubuntu26.04.vcpkg}/Dockerfile (97%)
 rename 11/{noble => ubuntu26.04}/Dockerfile (64%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4d76c4b..3988b70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         # Remember if you commit this, newly built images will replace those tags.
         # Prefer incrementing the version to unused one
-        tag: [11-mingw32, 11-noble, 11-noble32, 11-noblevcpkg]
+        tag: [11-mingw32, 11-ubuntu26.04, 11-ubuntu26.04.32, 11-ubuntu26.04.vcpkg]
     env:
       dockertag: ${{ matrix.tag }}
       REGISTRY: ghcr.io
diff --git a/11/noble32/Dockerfile b/11/ubuntu26.04.32/Dockerfile
similarity index 96%
rename from 11/noble32/Dockerfile
rename to 11/ubuntu26.04.32/Dockerfile
index f282330..5ef3fca 100644
--- a/11/noble32/Dockerfile
+++ b/11/ubuntu26.04.32/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386 \
diff --git a/11/noblevcpkg/Dockerfile b/11/ubuntu26.04.vcpkg/Dockerfile
similarity index 97%
rename from 11/noblevcpkg/Dockerfile
rename to 11/ubuntu26.04.vcpkg/Dockerfile
index 0fb542b..08915ce 100644
--- a/11/noblevcpkg/Dockerfile
+++ b/11/ubuntu26.04.vcpkg/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN dpkg --add-architecture i386 \
diff --git a/11/noble/Dockerfile b/11/ubuntu26.04/Dockerfile
similarity index 64%
rename from 11/noble/Dockerfile
rename to 11/ubuntu26.04/Dockerfile
index e89d15a..00bda3c 100644
--- a/11/noble/Dockerfile
+++ b/11/ubuntu26.04/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04
+FROM ubuntu:26.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
@@ -16,16 +16,9 @@ RUN apt-get update \
         libtbb-dev \
         libopenal-dev \
         libpng-dev \
+        libsdl3-dev \
         ninja-build \
         pkg-config \
     && update-ca-certificates \
     && rm -rf /var/lib/apt/lists/*
-RUN git clone --depth=1 https://github.com/libsdl-org/SDL.git \
-    && cd SDL \
-    && git checkout a962f40bbba175e9716557a25d5d7965f134a3d3 \
-    && mkdir build \
-    && cd build \
-    && cmake .. \
-    && cmake --build . \
-    && cmake --install .