diff --git a/.github/workflows/appimage10.yml b/.github/workflows/appimage10.yml index 09bf750e..3f5ffb4d 100644 --- a/.github/workflows/appimage10.yml +++ b/.github/workflows/appimage10.yml @@ -96,7 +96,7 @@ jobs: tcl_ref="$TCL_REF_INPUT" echo "Using workflow_dispatch TCL ref: $tcl_ref" else - tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) + tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) test -n "$tcl_ref" echo "Auto-resolved latest Tcl ref: $tcl_ref" fi diff --git a/.github/workflows/appimage7.yml b/.github/workflows/appimage7.yml index 0a01f292..4ab1574c 100644 --- a/.github/workflows/appimage7.yml +++ b/.github/workflows/appimage7.yml @@ -96,7 +96,7 @@ jobs: tcl_ref="$TCL_REF_INPUT" echo "Using workflow_dispatch TCL ref: $tcl_ref" else - tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) + tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) test -n "$tcl_ref" echo "Auto-resolved latest Tcl ref: $tcl_ref" fi diff --git a/.github/workflows/appimage8.yml b/.github/workflows/appimage8.yml index ea440227..e69d0502 100644 --- a/.github/workflows/appimage8.yml +++ b/.github/workflows/appimage8.yml @@ -96,7 +96,7 @@ jobs: tcl_ref="$TCL_REF_INPUT" echo "Using workflow_dispatch TCL ref: $tcl_ref" else - tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) + tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) test -n "$tcl_ref" echo "Auto-resolved latest Tcl ref: $tcl_ref" fi diff --git a/.github/workflows/appimage9.yml b/.github/workflows/appimage9.yml index 01e13030..3e799290 100644 --- a/.github/workflows/appimage9.yml +++ b/.github/workflows/appimage9.yml @@ -96,7 +96,7 @@ jobs: tcl_ref="$TCL_REF_INPUT" echo "Using workflow_dispatch TCL ref: $tcl_ref" else - tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) + tcl_ref=$(git ls-remote --tags --refs https://github.com/tcltk/tcl.git "refs/tags/${TCL_TAG_GLOB}" | awk '{print $2}' | sed 's#refs/tags/##' | sort -V | tail -1) test -n "$tcl_ref" echo "Auto-resolved latest Tcl ref: $tcl_ref" fi diff --git a/appimage/10/Dockerfile b/appimage/10/Dockerfile index b69db87e..14aed357 100644 --- a/appimage/10/Dockerfile +++ b/appimage/10/Dockerfile @@ -2,7 +2,7 @@ FROM almalinux:10 USER root -ARG TCL_SOURCE=tarball +ARG TCL_SOURCE=github ARG TCL_VERSION=9.0.4 ARG TCL_REF=core-9-0-4 ARG TCL_TARBALL_URL=https://codeload.github.com/tcltk/tcl/tar.gz/refs/tags/core-9-0-4 @@ -17,7 +17,6 @@ RUN dnf install -y python3 zlib-devel ncurses-devel readline-devel cairo-devel f && echo "### rpm -qa:" \ && rpm -qa | sort \ && echo "" -#RUN dnf group install -y "Development Tools" # Tcl/Tk WORKDIR /tcl diff --git a/appimage/7/Dockerfile b/appimage/7/Dockerfile index 5b71ee19..4a245bd6 100644 --- a/appimage/7/Dockerfile +++ b/appimage/7/Dockerfile @@ -26,7 +26,6 @@ RUN yum install -y cairo-devel freeglut-devel gcc make git tcsh \ && echo "### rpm -qa:" \ && rpm -qa | sort \ && echo "" -#RUN dnf group install -y "Development Tools" # Tcl/Tk WORKDIR /tcl diff --git a/appimage/8/Dockerfile b/appimage/8/Dockerfile index cf286bfd..e4909e56 100644 --- a/appimage/8/Dockerfile +++ b/appimage/8/Dockerfile @@ -2,7 +2,7 @@ FROM almalinux:8 USER root -ARG TCL_SOURCE=tarball +ARG TCL_SOURCE=github ARG TCL_VERSION=8.6.18 ARG TCL_REF=core-8-6-18 ARG TCL_TARBALL_URL=https://codeload.github.com/tcltk/tcl/tar.gz/refs/tags/core-8-6-18 @@ -16,7 +16,6 @@ RUN dnf install -y python311 zlib-devel ncurses-devel readline-devel cairo-devel && echo "### rpm -qa:" \ && rpm -qa | sort \ && echo "" -#RUN dnf group install -y "Development Tools" # Tcl/Tk WORKDIR /tcl diff --git a/appimage/9/Dockerfile b/appimage/9/Dockerfile index 527e2bed..925b8a7b 100644 --- a/appimage/9/Dockerfile +++ b/appimage/9/Dockerfile @@ -17,7 +17,6 @@ RUN dnf install -y python311 zlib-devel ncurses-devel readline-devel cairo-devel && echo "### rpm -qa:" \ && rpm -qa | sort \ && echo "" -#RUN dnf group install -y "Development Tools" # Tcl/Tk WORKDIR /tcl