Just ditch 24.04

duncanspumpkin · duncanspumpkin · commit 7ad067d5c365 · 2026-02-15T08:49:56.000Z
diff --git 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/ubuntu26.04.32/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/ubuntu26.04.vcpkg/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/ubuntu26.04/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 .
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM ubuntu:24.04`
	`1`	`+FROM ubuntu:26.04`
`2`	`2`
`3`	`3`	`ENV DEBIAN_FRONTEND=noninteractive`
`4`	`4`	`RUN dpkg --add-architecture i386 \`