From 0b51864ab47133e7e1fdcf520dd9b9717fde24a0 Mon Sep 17 00:00:00 2001
From: "Darryl L. Miles" <darryl.miles@darrylmiles.org>
Date: Mon, 20 Jul 2026 16:37:41 +0100
Subject: [PATCH] Finalize resolver cleanup handling and EL7 git dependency
 note

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
---
 .github/workflows/appimage10.yml | 6 +++++-
 .github/workflows/appimage7.yml  | 6 +++++-
 .github/workflows/appimage8.yml  | 6 +++++-
 .github/workflows/appimage9.yml  | 6 +++++-
 appimage/7/Dockerfile            | 1 +
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml
index b050caf5..08cf85a8 100644
--- a/.github/workflows/appimage10.yml
+++ b/.github/workflows/appimage10.yml
@@ -154,7 +154,11 @@ jobs:
 
           if [ "$source_method" = "github" ]; then
             tcl_tmpdir=$(mktemp -d)
-            git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"
+            if ! git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"; then
+              rm -rf "$tcl_tmpdir"
+              echo "Failed to clone Tcl ref $tcl_ref" >&2
+              exit 1
+            fi
             tcl_commit=$(git -C "$tcl_tmpdir" rev-parse HEAD)
             tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
             rm -rf "$tcl_tmpdir"
diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml
index a2514c72..22b8ccd4 100644
--- a/.github/workflows/appimage7.yml
+++ b/.github/workflows/appimage7.yml
@@ -154,7 +154,11 @@ jobs:
 
           if [ "$source_method" = "github" ]; then
             tcl_tmpdir=$(mktemp -d)
-            git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"
+            if ! git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"; then
+              rm -rf "$tcl_tmpdir"
+              echo "Failed to clone Tcl ref $tcl_ref" >&2
+              exit 1
+            fi
             tcl_commit=$(git -C "$tcl_tmpdir" rev-parse HEAD)
             tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
             rm -rf "$tcl_tmpdir"
diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml
index 8303948e..22c860bb 100644
--- a/.github/workflows/appimage8.yml
+++ b/.github/workflows/appimage8.yml
@@ -154,7 +154,11 @@ jobs:
 
           if [ "$source_method" = "github" ]; then
             tcl_tmpdir=$(mktemp -d)
-            git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"
+            if ! git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"; then
+              rm -rf "$tcl_tmpdir"
+              echo "Failed to clone Tcl ref $tcl_ref" >&2
+              exit 1
+            fi
             tcl_commit=$(git -C "$tcl_tmpdir" rev-parse HEAD)
             tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
             rm -rf "$tcl_tmpdir"
diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml
index b49e3dd0..765f6476 100644
--- a/.github/workflows/appimage9.yml
+++ b/.github/workflows/appimage9.yml
@@ -154,7 +154,11 @@ jobs:
 
           if [ "$source_method" = "github" ]; then
             tcl_tmpdir=$(mktemp -d)
-            git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"
+            if ! git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir"; then
+              rm -rf "$tcl_tmpdir"
+              echo "Failed to clone Tcl ref $tcl_ref" >&2
+              exit 1
+            fi
             tcl_commit=$(git -C "$tcl_tmpdir" rev-parse HEAD)
             tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
             rm -rf "$tcl_tmpdir"
diff --git a/appimage/7/Dockerfile b/appimage/7/Dockerfile
index aaaeb312..037230ac 100644
--- a/appimage/7/Dockerfile
+++ b/appimage/7/Dockerfile
@@ -22,6 +22,7 @@ ARG TCL_TARBALL_SHA256=
 ARG TK_TARBALL_SHA256=
 
 # Build Dependencies (and dump version to logging)
+# git is required to support TCL_SOURCE=github overrides from workflow_dispatch.
 RUN yum install -y cairo-devel freeglut-devel gcc make git tcsh \
     && echo "### rpm -qa:" \
     && rpm -qa | sort \