From 7d79a0c2e1d7751ade9256dce6f44a66fff0b3eb Mon Sep 17 00:00:00 2001
From: Lars Asplund <lars.anders.asplund@gmail.com>
Date: Sat, 26 Sep 2026 16:21:43 +0200
Subject: [PATCH] Updated GNAT and LLVM versions for GHDL build.

---
 .github/images.sh            | 29 +++++++++++++++++++----------
 .github/workflows/images.yml |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/images.sh b/.github/images.sh
index 003106c8a..c66f8d39c 100755
--- a/.github/images.sh
+++ b/.github/images.sh
@@ -1,18 +1,27 @@
 #!/bin/sh
+set -eu
 
-# Stop in case of error
-set -e
+: "${TAG:?TAG must be set}"
+: "${PKG:?PKG must be set}"
+
+# Download separately so a failed download stops the script.
+DOCKERFILE=$(curl -fsSL \
+  https://raw.githubusercontent.com/ghdl/docker/master/run_debian.dockerfile)
 
 docker build \
-  --build-arg IMAGE="python:3-slim-bullseye" \
-  --build-arg LLVM_VER=9 \
-  --build-arg GNAT_VER=9 \
+  --progress=plain \
+  --build-arg IMAGE="python:3.13-slim-bookworm" \
+  --build-arg LLVM_VER=14 \
+  --build-arg GNAT_VER=12 \
   --target vunit \
   -t "vunit/dev/${TAG}" \
-  - <<-EOF
-$(curl -fsSL https://raw.githubusercontent.com/ghdl/docker/master/run_debian.dockerfile)
+  - <<EOF
+${DOCKERFILE}
+
+FROM ${TAG} AS vunit
+
+COPY --from=ghdl/pkg:bookworm-${PKG} / /usr/local/
 
-FROM $TAG AS vunit
-COPY --from=ghdl/pkg:bullseye-$PKG / /
+RUN ghdl --version
 RUN pip install -U tox colorama coverage --progress-bar off
-EOF
+EOF
\ No newline at end of file
diff --git a/.github/workflows/images.yml b/.github/workflows/images.yml
index 119336992..763f3de25 100644
--- a/.github/workflows/images.yml
+++ b/.github/workflows/images.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         task: [
-          { tag: llvm,  pkg: llvm-9 },
+          { tag: llvm,  pkg: llvm-14 },
           { tag: mcode, pkg: mcode  },
         ]
     runs-on: ubuntu-latest