Finalize resolver cleanup handling and EL7 git dependency note
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
This commit is contained in:
parent
5c83dc7bc3
commit
0b51864ab4
|
|
@ -154,7 +154,11 @@ jobs:
|
||||||
|
|
||||||
if [ "$source_method" = "github" ]; then
|
if [ "$source_method" = "github" ]; then
|
||||||
tcl_tmpdir=$(mktemp -d)
|
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=$(git -C "$tcl_tmpdir" rev-parse HEAD)
|
||||||
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
||||||
rm -rf "$tcl_tmpdir"
|
rm -rf "$tcl_tmpdir"
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,11 @@ jobs:
|
||||||
|
|
||||||
if [ "$source_method" = "github" ]; then
|
if [ "$source_method" = "github" ]; then
|
||||||
tcl_tmpdir=$(mktemp -d)
|
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=$(git -C "$tcl_tmpdir" rev-parse HEAD)
|
||||||
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
||||||
rm -rf "$tcl_tmpdir"
|
rm -rf "$tcl_tmpdir"
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,11 @@ jobs:
|
||||||
|
|
||||||
if [ "$source_method" = "github" ]; then
|
if [ "$source_method" = "github" ]; then
|
||||||
tcl_tmpdir=$(mktemp -d)
|
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=$(git -C "$tcl_tmpdir" rev-parse HEAD)
|
||||||
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
||||||
rm -rf "$tcl_tmpdir"
|
rm -rf "$tcl_tmpdir"
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,11 @@ jobs:
|
||||||
|
|
||||||
if [ "$source_method" = "github" ]; then
|
if [ "$source_method" = "github" ]; then
|
||||||
tcl_tmpdir=$(mktemp -d)
|
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=$(git -C "$tcl_tmpdir" rev-parse HEAD)
|
||||||
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
tcl_commit_date=$(git -C "$tcl_tmpdir" log -1 --format=%ci)
|
||||||
rm -rf "$tcl_tmpdir"
|
rm -rf "$tcl_tmpdir"
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ ARG TCL_TARBALL_SHA256=
|
||||||
ARG TK_TARBALL_SHA256=
|
ARG TK_TARBALL_SHA256=
|
||||||
|
|
||||||
# Build Dependencies (and dump version to logging)
|
# 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 \
|
RUN yum install -y cairo-devel freeglut-devel gcc make git tcsh \
|
||||||
&& echo "### rpm -qa:" \
|
&& echo "### rpm -qa:" \
|
||||||
&& rpm -qa | sort \
|
&& rpm -qa | sort \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue