1.8 KiB
1.8 KiB
Resume Guide
Purpose
- Quick checklist to pick up work after restarting Codex CLI with expanded permissions.
Branches on remote
- main (default), integration, release, bootstrap, bootstrap-cicd
- Pull latest
- git fetch --all --prune
- git switch bootstrap && git pull
- git switch bootstrap-cicd && git pull
- git switch integration && git pull
- Ensure Docker is available
- Start Docker Desktop/daemon as needed
- Install hooks locally
- make -f scripts/Makefile hooks-setup
- Run local checks (Docker-only)
- git switch bootstrap && make -f scripts/Makefile quick && make -f scripts/Makefile build
- git switch bootstrap-cicd && make -f scripts/Makefile quick && make -f scripts/Makefile build
- Optional full pass: make -f scripts/Makefile check
- Open PRs (when branches are green locally)
- bootstrap → integration: https://git.knownelement.com/KNEL/LLMScaffolding/pulls/new/bootstrap
- bootstrap-cicd → integration: https://git.knownelement.com/KNEL/LLMScaffolding/pulls/new/bootstrap-cicd
- Merge to integration
- Use squash merge, allow auto-merge on green where configured
- Release to main
- Open PR: integration → main (require 1 approval)
- After merge, tag manually (until CI runners are enabled):
- git switch main && git pull
- TAG=$(date -u +"v%Y.%m.%d-%H%M")
- git tag -a "$TAG" -m "Release $TAG"
- git push origin "$TAG"
- Optional: fast-forward release branch pointer:
- git branch -f release main && git push -f origin release
- Docs & parity
- Git workflow: docs/git-workflow.md
- Local CI parity: docs/bootstrap-cicd.md
- Defer CI enablement for two weeks
- Track in docs/TODO.md: Revisit enabling runners and protected checks on 2025-09-24
- Next tasks
- Answer any outstanding questions in COMMON/questions/*
- On approval, implement further proposals and update instructions/*