From 63869d8e3790036560b3064339876cf596119acb Mon Sep 17 00:00:00 2001
From: "Jeffrey C. Ollie" <jeff@ocjtech.us>
Date: Thu, 14 Aug 2025 21:44:36 -0500
Subject: [PATCH] ci: switch to debian 13

---
 .github/workflows/test.yml         |  8 ++++----
 src/build/docker/debian/Dockerfile | 24 ++++++++++--------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 5c6b57d69..c00816b38 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -36,7 +36,7 @@ jobs:
       - translations
       - blueprint-compiler
       - test-pkg-linux
-      - test-debian-12
+      - test-debian-13
       - zig-fmt
     steps:
       - id: status
@@ -957,8 +957,8 @@ jobs:
         run: |
           nix develop -c sh -c "cd pkg/${{ matrix.pkg }} ; zig build test"
 
-  test-debian-12:
-    name: Test build on Debian 12
+  test-debian-13:
+    name: Test build on Debian 13
     runs-on: namespace-profile-ghostty-sm
     needs: [test, build-dist]
     steps:
@@ -984,7 +984,7 @@ jobs:
           context: dist
           file: dist/src/build/docker/debian/Dockerfile
           build-args: |
-            DISTRO_VERSION=12
+            DISTRO_VERSION=13
 
   flatpak-check-zig-cache:
     if: github.repository == 'ghostty-org/ghostty'
diff --git a/src/build/docker/debian/Dockerfile b/src/build/docker/debian/Dockerfile
index b1389aa17..73c7da7c8 100644
--- a/src/build/docker/debian/Dockerfile
+++ b/src/build/docker/debian/Dockerfile
@@ -1,10 +1,11 @@
-ARG DISTRO_VERSION="12"
+ARG DISTRO_VERSION="13"
 FROM docker.io/library/debian:${DISTRO_VERSION}
 
 # Install Dependencies
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -qq update && \
     apt-get -qq -y --no-install-recommends install \
     # Build Tools
+    blueprint-compiler \
     build-essential \
     curl \
     libbz2-dev \
@@ -16,33 +17,28 @@ RUN DEBIAN_FRONTEND="noninteractive" apt-get -qq update && \
     pandoc \
     # Ghostty Dependencies
     libadwaita-1-dev \
-    libgtk-4-dev && \
-    # TODO: Add when this is updated to Debian 13++
-    # gtk4-layer-shell
+    libgtk-4-dev \
+    libgtk4-layer-shell-dev && \
     # Clean up for better caching
     rm -rf /var/lib/apt/lists/*
 
-# work around the fact that Debian 12 doesn't ship a pkg-config file for bzip2
-RUN . /etc/os-release; if [ $VERSION_ID -le 12 ]; then ln -s libbz2.so /usr/lib/$(gcc -dumpmachine)/libbzip2.so; fi
+WORKDIR /src
+
+COPY ./build.zig /src
 
 # Install zig
 # https://ziglang.org/download/
 
-COPY . /src
-
-WORKDIR /src
-
 RUN export ZIG_VERSION=$(sed -n -e 's/^.*requireZig("\(.*\)").*$/\1/p' build.zig) && curl -L -o /tmp/zig.tar.xz "https://ziglang.org/download/$ZIG_VERSION/zig-linux-$(uname -m)-$ZIG_VERSION.tar.xz" && \
     tar -xf /tmp/zig.tar.xz -C /opt && \
     rm /tmp/zig.tar.xz && \
     ln -s "/opt/zig-linux-$(uname -m)-$ZIG_VERSION/zig" /usr/local/bin/zig
 
-# Debian 12 doesn't have gtk4-layer-shell, so we have to manually compile it ourselves
+COPY . /src
+
 RUN zig build \
     -Doptimize=Debug \
-    -Dcpu=baseline \
-    -Dapp-runtime=gtk \
-    -fno-sys=gtk4-layer-shell
+    -Dcpu=baseline
 
 RUN ./zig-out/bin/ghostty +version