nathan/agrarian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Verify build menu checkout freshness

Browse Source
This commit is contained in:
root
2026-05-01 04:53:52 +00:00
parent 8a52d9d220
commit fa0162eff2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/agrarian-build-menu.sh
+10 -1
View File
@@ -263,6 +263,8 @@ install_bootstrap_packages() {
} }
ensure_repo() { ensure_repo() {
local head remote_head
if [[ "${AGRARIAN_PROMPTS_DONE:-0}" != "1" ]]; then if [[ "${AGRARIAN_PROMPTS_DONE:-0}" != "1" ]]; then
WORKDIR="$(prompt "Repository directory" "$WORKDIR")" WORKDIR="$(prompt "Repository directory" "$WORKDIR")"
JOBS="$(prompt "Parallel build jobs" "$JOBS")" JOBS="$(prompt "Parallel build jobs" "$JOBS")"
@@ -270,7 +272,7 @@ ensure_repo() {
if [[ -d "$WORKDIR/.git" ]]; then if [[ -d "$WORKDIR/.git" ]]; then
ROOT="$WORKDIR" ROOT="$WORKDIR"
run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin run_step 25 "Fetching existing Agrarian checkout" git -C "$ROOT" fetch origin "$BRANCH"
run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout "$BRANCH" run_step 30 "Checking out $BRANCH" git -C "$ROOT" checkout "$BRANCH"
run_step 35 "Fast-forwarding $BRANCH" git -C "$ROOT" pull --ff-only origin "$BRANCH" run_step 35 "Fast-forwarding $BRANCH" git -C "$ROOT" pull --ff-only origin "$BRANCH"
else else
@@ -279,6 +281,13 @@ ensure_repo() {
ROOT="$WORKDIR" ROOT="$WORKDIR"
fi fi
head="$(git -C "$ROOT" rev-parse --short HEAD)"
remote_head="$(git -C "$ROOT" rev-parse --short "origin/$BRANCH" 2>/dev/null || true)"
if [[ -n "$remote_head" && "$head" != "$remote_head" ]]; then
fail "Checkout is at $head but origin/$BRANCH is $remote_head. Refusing to build an outdated checkout."
fi
echo "Using Agrarian $BRANCH at commit $head"
cd "$ROOT" cd "$ROOT"
} }