Pin the pre-push hook's .NET channel and prefer an installed SDK
A git hook runs with a stripped PATH, so `command -v dotnet` missed the SDK that was already installed and ensure_dotnet fell through to downloading one. It asked for the current channel, got .NET 9, and failed every project in the solution with NETSDK1045 — the build only breaks when the hook actually runs, which is precisely when it is least welcome. ensure_dotnet now looks in DOTNET_ROOT and the usual per-user and system install locations before downloading anything, and the download is pinned to the channel matching the repo's TargetFramework rather than whatever is current. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01S56bfZMGe1hnhpWP4CjjNw
This commit is contained in:
co-authored by
Claude Opus 5
parent
725758ccd9
commit
96021c5fee
+23
-8
@@ -15,20 +15,35 @@ fail() {
|
|||||||
# Repo root, regardless of the caller's cwd.
|
# Repo root, regardless of the caller's cwd.
|
||||||
CI_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
CI_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||||
|
|
||||||
# Prepends a locally installed .NET SDK to PATH when `dotnet` is missing, so a runner
|
# The .NET channel to install when no SDK is found. This has to match the TargetFramework
|
||||||
# with no SDK preinstalled behaves the same as a dev machine.
|
# the projects declare — a git hook runs with a stripped PATH, so "whatever channel is
|
||||||
|
# current" quietly installed .NET 9 for a net10.0 repo and failed the whole build.
|
||||||
|
DOTNET_CHANNEL="${DOTNET_CHANNEL:-10.0}"
|
||||||
|
|
||||||
|
# Puts a .NET SDK on PATH. Prefers one that is already installed — including the common
|
||||||
|
# per-user and system locations a git hook's PATH does not include — and only downloads
|
||||||
|
# one as a last resort, so a bare runner behaves the same as a dev machine.
|
||||||
ensure_dotnet() {
|
ensure_dotnet() {
|
||||||
if command -v dotnet > /dev/null 2>&1; then
|
if command -v dotnet > /dev/null 2>&1; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local install_dir="$CI_ROOT/.dotnet"
|
local candidate
|
||||||
if [[ ! -x "$install_dir/dotnet" ]]; then
|
for candidate in "${DOTNET_ROOT:-}" "$CI_ROOT/.dotnet" "$HOME/.dotnet" /usr/share/dotnet /usr/lib/dotnet; do
|
||||||
log "dotnet not found on PATH; installing the .NET SDK"
|
if [[ -n "$candidate" && -x "$candidate/dotnet" ]]; then
|
||||||
curl -fsSL https://dot.net/v1/dotnet-install.sh -o "/tmp/dotnet-install.sh"
|
log "Using the .NET SDK at $candidate"
|
||||||
bash "/tmp/dotnet-install.sh" --channel STS --install-dir "$install_dir"
|
export PATH="$candidate:$PATH"
|
||||||
rm -f "/tmp/dotnet-install.sh"
|
export DOTNET_ROOT="$candidate"
|
||||||
|
return 0
|
||||||
fi
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
local install_dir="$CI_ROOT/.dotnet"
|
||||||
|
log "dotnet not found; installing the .NET $DOTNET_CHANNEL SDK into $install_dir"
|
||||||
|
curl -fsSL https://dot.net/v1/dotnet-install.sh -o "/tmp/dotnet-install.sh"
|
||||||
|
bash "/tmp/dotnet-install.sh" --channel "$DOTNET_CHANNEL" --install-dir "$install_dir"
|
||||||
|
rm -f "/tmp/dotnet-install.sh"
|
||||||
|
|
||||||
export PATH="$install_dir:$PATH"
|
export PATH="$install_dir:$PATH"
|
||||||
export DOTNET_ROOT="$install_dir"
|
export DOTNET_ROOT="$install_dir"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user