chore(workflow): add solo branch landing helper
This commit is contained in:
Developer
@@ -17,6 +17,7 @@
|
||||
- Focused frontend typecheck: `npx tsc --noEmit`
|
||||
- Local dev stack: `docker compose -f docker-compose.dev.yml up --build`
|
||||
- Production stack: `docker compose up --build`
|
||||
- Solo landing: after review and verification, squash-land a feature branch with `bash scripts/land-branch.sh <feature-branch> "<conventional commit message>"`; do not commit directly on `main`.
|
||||
|
||||
## Repo-Specific Gotchas
|
||||
|
||||
|
||||
Executable
+208
@@ -0,0 +1,208 @@
|
||||
#!/usr/bin/env bash
|
||||
# land-branch.sh — Solo-local integrate: squash-merge feature branch onto main and push.
|
||||
# Requires GIT_BIGPOWERS_LAND=1 for hook exceptions on commit/push to protected branches.
|
||||
# Usage: bash scripts/land-branch.sh <feature-branch> "<conventional commit message>"
|
||||
# Run from the primary repository root (not a linked worktree).
|
||||
set -euo pipefail
|
||||
|
||||
CONVENTIONAL_REGEX='^(feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(\(.+\))?!?: .+'
|
||||
|
||||
usage_land() {
|
||||
echo "Usage: $0 <feature-branch> \"<conventional commit message>\" [--skip-verify]" >&2
|
||||
echo " Run from primary repo root after release-branch gates (solo-local mode)." >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
land_branch_deny() {
|
||||
echo "ERROR: $1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
SKIP_VERIFY=false
|
||||
ARGS=()
|
||||
for arg in "$@"; do
|
||||
if [ "$arg" = "--skip-verify" ]; then
|
||||
SKIP_VERIFY=true
|
||||
else
|
||||
ARGS+=("$arg")
|
||||
fi
|
||||
done
|
||||
|
||||
FEATURE_BRANCH="${ARGS[0]:-}"
|
||||
COMMIT_MSG="${ARGS[1]:-}"
|
||||
|
||||
[ -n "$FEATURE_BRANCH" ] && [ -n "$COMMIT_MSG" ] || usage_land
|
||||
|
||||
if [[ ! "$COMMIT_MSG" =~ $CONVENTIONAL_REGEX ]]; then
|
||||
land_branch_deny "Commit message must follow Conventional Commits: <type>(<scope>): <subject>"
|
||||
fi
|
||||
|
||||
if [ ${#COMMIT_MSG} -gt 72 ]; then
|
||||
land_branch_deny "Commit subject line must be 72 characters or less"
|
||||
fi
|
||||
|
||||
# Block AI agent attribution (P1 — CONVENTIONS.md § Git Attribution)
|
||||
if echo "$COMMIT_MSG" | grep -qiE '^co[- ]authored[- ]by:' || echo "$COMMIT_MSG" | grep -qiE '\nco[- ]authored[- ]by:'; then
|
||||
land_branch_deny "Commit must not include Co-authored-by: footer. All commits must appear as if authored solely by the human user."
|
||||
fi
|
||||
|
||||
# Primary worktree only (.git is a directory, not a gitdir pointer file)
|
||||
if [ -f .git ]; then
|
||||
land_branch_deny "Run from the primary repository root, not a linked worktree (cd to main repo first)"
|
||||
fi
|
||||
|
||||
detect_default_branch() {
|
||||
local remote_head
|
||||
remote_head=$(git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || true)
|
||||
if [ -n "$remote_head" ]; then
|
||||
echo "$remote_head"
|
||||
return
|
||||
fi
|
||||
if git show-ref --verify --quiet refs/heads/main; then
|
||||
echo "main"
|
||||
elif git show-ref --verify --quiet refs/heads/master; then
|
||||
echo "master"
|
||||
else
|
||||
land_branch_deny "Could not detect default branch (main/master)"
|
||||
fi
|
||||
}
|
||||
|
||||
DEFAULT_BRANCH=$(detect_default_branch)
|
||||
REPO_ROOT=$(pwd)
|
||||
|
||||
echo "==> Land branch: $FEATURE_BRANCH -> $DEFAULT_BRANCH"
|
||||
echo " Repo root: $REPO_ROOT"
|
||||
|
||||
if ! git show-ref --verify --quiet "refs/heads/$FEATURE_BRANCH"; then
|
||||
land_branch_deny "Feature branch '$FEATURE_BRANCH' does not exist"
|
||||
fi
|
||||
|
||||
# Scan all commits in feature branch for Co-authored-by: footers
|
||||
if git log "$DEFAULT_BRANCH..$FEATURE_BRANCH" --format="%B" 2>/dev/null | grep -qiE '^co[- ]authored[- ]by:'; then
|
||||
land_branch_deny "Feature branch '$FEATURE_BRANCH' contains Co-authored-by: footer(s). Amend commits to remove all AI agent attribution before landing."
|
||||
fi
|
||||
|
||||
for protected in main master; do
|
||||
if [ "$FEATURE_BRANCH" = "$protected" ]; then
|
||||
land_branch_deny "Cannot land protected branch '$FEATURE_BRANCH'"
|
||||
fi
|
||||
done
|
||||
|
||||
run_verify_suite() {
|
||||
echo "==> Running pre-land verification..."
|
||||
if [ -f package.json ] && command -v jq >/dev/null 2>&1; then
|
||||
if jq -e '.scripts.compliance' package.json >/dev/null 2>&1; then
|
||||
npm run compliance
|
||||
return
|
||||
fi
|
||||
if jq -e '.scripts.test' package.json >/dev/null 2>&1; then
|
||||
local test_script
|
||||
test_script=$(jq -r '.scripts.test' package.json)
|
||||
if [ "$test_script" = "echo \"Error: no test specified\" && exit 1" ]; then
|
||||
:
|
||||
elif [ "$test_script" = "false" ]; then
|
||||
:
|
||||
else
|
||||
npm test
|
||||
return
|
||||
fi
|
||||
fi
|
||||
if jq -e '.scripts.lint' package.json >/dev/null 2>&1; then
|
||||
npm run lint
|
||||
fi
|
||||
fi
|
||||
if [ -f scripts/sync-skills.sh ]; then
|
||||
bash scripts/sync-skills.sh
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "$SKIP_VERIFY" = false ]; then
|
||||
run_verify_suite
|
||||
else
|
||||
echo "==> Skipping verification (--skip-verify)"
|
||||
fi
|
||||
|
||||
echo "==> Updating $DEFAULT_BRANCH"
|
||||
git checkout "$DEFAULT_BRANCH"
|
||||
if ! git diff-index --quiet HEAD -- 2>/dev/null; then
|
||||
land_branch_deny "Working tree on $DEFAULT_BRANCH is not clean. Stash or commit first."
|
||||
fi
|
||||
|
||||
if git remote get-url origin >/dev/null 2>&1; then
|
||||
git pull --ff-only origin "$DEFAULT_BRANCH" || land_branch_deny "git pull --ff-only failed; resolve before landing"
|
||||
fi
|
||||
|
||||
if ! git merge-base --is-ancestor "$DEFAULT_BRANCH" "$FEATURE_BRANCH" 2>/dev/null; then
|
||||
land_branch_deny "Feature branch '$FEATURE_BRANCH' is not based on current $DEFAULT_BRANCH (rebase or recreate branch)"
|
||||
fi
|
||||
|
||||
export GIT_BIGPOWERS_LAND=1
|
||||
|
||||
echo "==> Squash merge $FEATURE_BRANCH"
|
||||
git merge --squash "$FEATURE_BRANCH"
|
||||
if git diff-index --quiet HEAD -- 2>/dev/null; then
|
||||
land_branch_deny "Squash merge produced no changes (already merged?)"
|
||||
fi
|
||||
|
||||
git commit -m "$COMMIT_MSG"
|
||||
LAND_SHA=$(git rev-parse --short HEAD)
|
||||
echo "==> Land commit: $LAND_SHA"
|
||||
|
||||
if git remote get-url origin >/dev/null 2>&1; then
|
||||
echo "==> Pushing $DEFAULT_BRANCH to origin"
|
||||
git push origin "$DEFAULT_BRANCH"
|
||||
fi
|
||||
|
||||
# Epic capsule archival (evolved bigpowers v4.0.0+)
|
||||
# Move completed epic capsules to archive when all stories are done
|
||||
echo "==> Checking for completed epic capsules to archive..."
|
||||
if [ -d specs/epics ] && [ -f specs/execution-status.yaml ]; then
|
||||
for capsule in specs/epics/e[0-9]*-*/; do
|
||||
[ -d "$capsule" ] || continue
|
||||
capsule_name=$(basename "$capsule")
|
||||
epic_id=$(echo "$capsule_name" | grep -o '^e[0-9]*' || true)
|
||||
[ -n "$epic_id" ] || continue
|
||||
# Check if all stories in this epic are done
|
||||
ALL_DONE=true
|
||||
if [ -f "$capsule/epic.yaml" ]; then
|
||||
for story_id in $(grep -o 'e[0-9]*s[0-9]*' "$capsule/epic.yaml" 2>/dev/null || true); do
|
||||
STATUS=$(grep "$story_id:" specs/execution-status.yaml 2>/dev/null | awk '{print $2}' || echo "todo")
|
||||
if [ "$STATUS" != "done" ]; then
|
||||
ALL_DONE=false
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if [ "$ALL_DONE" = true ]; then
|
||||
mkdir -p specs/epics/archive
|
||||
echo " Archiving completed epic: $capsule_name → specs/epics/archive/"
|
||||
mv "$capsule" "specs/epics/archive/"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Worktree cleanup
|
||||
WORKTREE_PATH="../$FEATURE_BRANCH"
|
||||
if git worktree list --porcelain 2>/dev/null | grep -q "^worktree $WORKTREE_PATH$"; then
|
||||
echo "==> Removing worktree $WORKTREE_PATH"
|
||||
git worktree remove "$WORKTREE_PATH" 2>/dev/null || git worktree remove -f "$WORKTREE_PATH"
|
||||
fi
|
||||
git worktree prune 2>/dev/null || true
|
||||
|
||||
if git show-ref --verify --quiet "refs/heads/$FEATURE_BRANCH"; then
|
||||
git branch -d "$FEATURE_BRANCH" 2>/dev/null || {
|
||||
echo "WARN: Could not delete branch $FEATURE_BRANCH (not fully merged? use -D manually if intended)"
|
||||
}
|
||||
fi
|
||||
|
||||
git checkout "$DEFAULT_BRANCH"
|
||||
|
||||
echo ""
|
||||
echo "Land complete."
|
||||
echo " Branch: $FEATURE_BRANCH (removed)"
|
||||
echo " Commit: $LAND_SHA on $DEFAULT_BRANCH"
|
||||
echo " Message: $COMMIT_MSG"
|
||||
echo " cwd: $(pwd)"
|
||||
echo " current: $(git branch --show-current)"
|
||||
echo ""
|
||||
echo "semantic-release will pick up the push to $DEFAULT_BRANCH when configured."
|
||||
Reference in New Issue
Block a user