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

Merge pull request 'fix: fix: ensure_ops_repo() should call migrate_ops_repo() to seed missing dirs (#688)' (#691) from fix/issue-688 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-11 21:25:55 +00:00
commit 0add73f409
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.woodpecker/agent-smoke.sh
View file

@ -213,7 +213,7 @@ check_script lib/agent-sdk.sh
check_script lib/ci-helpers.sh check_script lib/ci-helpers.sh
check_script lib/secret-scan.sh check_script lib/secret-scan.sh
check_script lib/tea-helpers.sh lib/secret-scan.sh check_script lib/tea-helpers.sh lib/secret-scan.sh
check_script lib/formula-session.sh check_script lib/formula-session.sh lib/ops-setup.sh
check_script lib/load-project.sh check_script lib/load-project.sh
check_script lib/mirrors.sh lib/env.sh check_script lib/mirrors.sh lib/env.sh
check_script lib/guard.sh check_script lib/guard.sh

4
lib/formula-session.sh
View file

@ -33,6 +33,9 @@
# Source agent-sdk for claude_run_with_watchdog watchdog helper # Source agent-sdk for claude_run_with_watchdog watchdog helper
source "$(dirname "${BASH_SOURCE[0]}")/agent-sdk.sh" source "$(dirname "${BASH_SOURCE[0]}")/agent-sdk.sh"
# Source ops-setup for migrate_ops_repo (used by ensure_ops_repo)
source "$(dirname "${BASH_SOURCE[0]}")/ops-setup.sh"
# ── Run guards ─────────────────────────────────────────────────────────── # ── Run guards ───────────────────────────────────────────────────────────
# acquire_run_lock LOCK_FILE # acquire_run_lock LOCK_FILE
@ -610,6 +613,7 @@ ensure_ops_repo() {
git -C "$ops_root" fetch origin "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true git -C "$ops_root" fetch origin "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true
git -C "$ops_root" checkout "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true git -C "$ops_root" checkout "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true
git -C "$ops_root" pull --ff-only origin "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true git -C "$ops_root" pull --ff-only origin "${PRIMARY_BRANCH}" --quiet 2>/dev/null || true
migrate_ops_repo "$ops_root" "${PRIMARY_BRANCH}"
return 0 return 0
fi fi