disinto-admin/disinto
1
0
Fork 0
Code Issues 15 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: fix: gardener-run.sh uses manual worktree setup instead of formula_worktree_setup() (#281)' (#290) from fix/issue-281 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
Details

Browse source
This commit is contained in:
dev-bot 2026-04-06 10:04:02 +00:00
commit 5cf058b04b
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
gardener/gardener-run.sh
View file

@ -127,16 +127,7 @@ ${SCRATCH_INSTRUCTION}
${PROMPT_FOOTER}" ${PROMPT_FOOTER}"
# ── Create worktree ────────────────────────────────────────────────────── # ── Create worktree ──────────────────────────────────────────────────────
cd "$PROJECT_REPO_ROOT" formula_worktree_setup "$WORKTREE"
git fetch "${FORGE_REMOTE}" "$PRIMARY_BRANCH" 2>/dev/null || true
worktree_cleanup "$WORKTREE"
git worktree add "$WORKTREE" "${FORGE_REMOTE}/${PRIMARY_BRANCH}" --detach 2>/dev/null
cleanup() {
worktree_cleanup "$WORKTREE"
rm -f "$GARDENER_PR_FILE"
}
trap cleanup EXIT
# ── Post-merge manifest execution ──────────────────────────────────────── # ── Post-merge manifest execution ────────────────────────────────────────
# Reads gardener/pending-actions.json and executes each action via API. # Reads gardener/pending-actions.json and executes each action via API.