From e28c93bb90d758b57f0710ba05e7d4db118341da Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Mon, 20 Jul 2026 16:31:27 +0100 Subject: [PATCH] Polish Tcl/Tk workflow and Dockerfile review nits Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .github/workflows/appimage10.yml | 2 +- .github/workflows/appimage7.yml | 2 +- .github/workflows/appimage8.yml | 2 +- .github/workflows/appimage9.yml | 2 +- appimage/10/Dockerfile | 8 ++++---- appimage/7/Dockerfile | 8 ++++---- appimage/8/Dockerfile | 8 ++++---- appimage/9/Dockerfile | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml index 3f5ffb4d..04e7a93b 100644 --- a/.github/workflows/appimage10.yml +++ b/.github/workflows/appimage10.yml @@ -128,7 +128,7 @@ jobs: if [ "$source_method" = "github" ]; then tcl_tmpdir=$(mktemp -d) - git -c advice.detachedHead=false clone --depth 1 --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" + git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" 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 4ab1574c..230f0c52 100644 --- a/.github/workflows/appimage7.yml +++ b/.github/workflows/appimage7.yml @@ -128,7 +128,7 @@ jobs: if [ "$source_method" = "github" ]; then tcl_tmpdir=$(mktemp -d) - git -c advice.detachedHead=false clone --depth 1 --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" + git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" 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 e69d0502..a4bcd4c5 100644 --- a/.github/workflows/appimage8.yml +++ b/.github/workflows/appimage8.yml @@ -128,7 +128,7 @@ jobs: if [ "$source_method" = "github" ]; then tcl_tmpdir=$(mktemp -d) - git -c advice.detachedHead=false clone --depth 1 --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" + git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" 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 3e799290..37f456c3 100644 --- a/.github/workflows/appimage9.yml +++ b/.github/workflows/appimage9.yml @@ -128,7 +128,7 @@ jobs: if [ "$source_method" = "github" ]; then tcl_tmpdir=$(mktemp -d) - git -c advice.detachedHead=false clone --depth 1 --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" + git -c advice.detachedHead=false clone --depth 1 --single-branch --branch "$tcl_ref" https://github.com/tcltk/tcl.git "$tcl_tmpdir" 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/10/Dockerfile b/appimage/10/Dockerfile index 14aed357..a0b2966f 100644 --- a/appimage/10/Dockerfile +++ b/appimage/10/Dockerfile @@ -26,12 +26,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TCL_TARBALL_URL" -o /tmp/tcl-src.tar.gz; \ - actual_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ + computed_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TCL_TARBALL_SHA256" ]; then \ echo "$TCL_TARBALL_SHA256 /tmp/tcl-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tcl tarball ($TCL_TARBALL_URL)"; \ - echo "WARNING: actual Tcl tarball SHA256 is $actual_tcl_sha"; \ + echo "WARNING: actual Tcl tarball SHA256 is $computed_tcl_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tcl-src.tar.gz -C .; \ fi; \ @@ -47,12 +47,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TK_TARBALL_URL" -o /tmp/tk-src.tar.gz; \ - actual_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ + computed_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TK_TARBALL_SHA256" ]; then \ echo "$TK_TARBALL_SHA256 /tmp/tk-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tk tarball ($TK_TARBALL_URL)"; \ - echo "WARNING: actual Tk tarball SHA256 is $actual_tk_sha"; \ + echo "WARNING: actual Tk tarball SHA256 is $computed_tk_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tk-src.tar.gz -C .; \ fi; \ diff --git a/appimage/7/Dockerfile b/appimage/7/Dockerfile index 4a245bd6..aaaeb312 100644 --- a/appimage/7/Dockerfile +++ b/appimage/7/Dockerfile @@ -35,12 +35,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TCL_TARBALL_URL" -o /tmp/tcl-src.tar.gz; \ - actual_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ + computed_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TCL_TARBALL_SHA256" ]; then \ echo "$TCL_TARBALL_SHA256 /tmp/tcl-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tcl tarball ($TCL_TARBALL_URL)"; \ - echo "WARNING: actual Tcl tarball SHA256 is $actual_tcl_sha"; \ + echo "WARNING: actual Tcl tarball SHA256 is $computed_tcl_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tcl-src.tar.gz -C .; \ fi; \ @@ -56,12 +56,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TK_TARBALL_URL" -o /tmp/tk-src.tar.gz; \ - actual_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ + computed_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TK_TARBALL_SHA256" ]; then \ echo "$TK_TARBALL_SHA256 /tmp/tk-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tk tarball ($TK_TARBALL_URL)"; \ - echo "WARNING: actual Tk tarball SHA256 is $actual_tk_sha"; \ + echo "WARNING: actual Tk tarball SHA256 is $computed_tk_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tk-src.tar.gz -C .; \ fi; \ diff --git a/appimage/8/Dockerfile b/appimage/8/Dockerfile index e4909e56..5fcde1e5 100644 --- a/appimage/8/Dockerfile +++ b/appimage/8/Dockerfile @@ -25,12 +25,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TCL_TARBALL_URL" -o /tmp/tcl-src.tar.gz; \ - actual_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ + computed_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TCL_TARBALL_SHA256" ]; then \ echo "$TCL_TARBALL_SHA256 /tmp/tcl-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tcl tarball ($TCL_TARBALL_URL)"; \ - echo "WARNING: actual Tcl tarball SHA256 is $actual_tcl_sha"; \ + echo "WARNING: actual Tcl tarball SHA256 is $computed_tcl_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tcl-src.tar.gz -C .; \ fi; \ @@ -46,12 +46,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TK_TARBALL_URL" -o /tmp/tk-src.tar.gz; \ - actual_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ + computed_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TK_TARBALL_SHA256" ]; then \ echo "$TK_TARBALL_SHA256 /tmp/tk-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tk tarball ($TK_TARBALL_URL)"; \ - echo "WARNING: actual Tk tarball SHA256 is $actual_tk_sha"; \ + echo "WARNING: actual Tk tarball SHA256 is $computed_tk_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tk-src.tar.gz -C .; \ fi; \ diff --git a/appimage/9/Dockerfile b/appimage/9/Dockerfile index 925b8a7b..c26dddad 100644 --- a/appimage/9/Dockerfile +++ b/appimage/9/Dockerfile @@ -26,12 +26,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TCL_TARBALL_URL" -o /tmp/tcl-src.tar.gz; \ - actual_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ + computed_tcl_sha=$(sha256sum /tmp/tcl-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TCL_TARBALL_SHA256" ]; then \ echo "$TCL_TARBALL_SHA256 /tmp/tcl-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tcl tarball ($TCL_TARBALL_URL)"; \ - echo "WARNING: actual Tcl tarball SHA256 is $actual_tcl_sha"; \ + echo "WARNING: actual Tcl tarball SHA256 is $computed_tcl_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tcl-src.tar.gz -C .; \ fi; \ @@ -47,12 +47,12 @@ RUN set -eux; \ git checkout --detach "$TCL_REF"; \ else \ curl -fsSL "$TK_TARBALL_URL" -o /tmp/tk-src.tar.gz; \ - actual_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ + computed_tk_sha=$(sha256sum /tmp/tk-src.tar.gz | cut -d' ' -f1); \ if [ -n "$TK_TARBALL_SHA256" ]; then \ echo "$TK_TARBALL_SHA256 /tmp/tk-src.tar.gz" | sha256sum --check -; \ else \ echo "WARNING: no known SHA for Tk tarball ($TK_TARBALL_URL)"; \ - echo "WARNING: actual Tk tarball SHA256 is $actual_tk_sha"; \ + echo "WARNING: actual Tk tarball SHA256 is $computed_tk_sha"; \ fi; \ tar --strip-components=1 -xzf /tmp/tk-src.tar.gz -C .; \ fi; \