mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-11-22 15:10:00 +08:00
fix/plugin-launcher-isolated-python
2
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
cbcf8d8d9b |
fix(scripts): skip ci-precheck in the pre-push hook when a push only deletes refs (#4702)
## Description The pre-push hook that `make install-git-hooks` writes runs the full `make ci-precheck` (cargo fmt, clippy and the workspace tests, plus the Python suite) even when a push only deletes branches. Its loop over the refs on stdin skips deleted refs with `continue`, but the precheck runs after the loop regardless, so `git push origin --delete <branch>` waits several minutes for checks on code it doesn't send. This PR tracks whether any ref in the push is an update, and exits 0 when none is. No tracking issue. ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) - [ ] New feature (non-breaking change that adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update - [ ] Performance improvement - [ ] Code refactoring (no functional changes) ## Changes Made - `scripts/install-git-hooks.sh` (the generated pre-push hook): set `has_update=1` for every non-delete ref and `exit 0` after the loop when no ref was an update. A push that mixes a delete with an update still runs the precheck. - The delete check now matches an all-zero sha of any length (`^0+$`), so SHA-256 repositories (64-zero null id) are also recognised. The old check compared against exactly 40 zeros. - Removed the hook comment about gating only "main tracking branches"; the hook has no such pattern. - `tests/test_install_git_hooks_script.py`: three end-to-end tests that install the hooks into a temp repo and push to a bare remote with `make` stubbed to log its calls. A branch update runs `make ci-precheck`; a delete-only push does not (and the remote branch is gone); a push that mixes a delete and an update runs it once. ## Testing - [x] Unit tests pass (`pytest`) - [x] Linting passes (`ruff check .`) - [ ] Type checking passes (`mypy headroom`) (not run: no `headroom/` code changed; the pre-commit mypy hook passed on the changed test file) - [x] New tests added for new functionality - [x] Manual testing performed ### Test Output ```text $ pytest -q tests/test_install_git_hooks_script.py # this branch ....... [100%] 7 passed in 3.97s $ pytest -q tests/test_install_git_hooks_script.py # same tests, origin/main's script E AssertionError: assert ['ci-precheck'] == [] FAILED tests/test_install_git_hooks_script.py::test_pre_push_skips_ci_precheck_for_a_delete_only_push 1 failed, 6 passed in 3.40s $ ruff check tests/test_install_git_hooks_script.py All checks passed! $ ruff format --check tests/test_install_git_hooks_script.py 1 file already formatted $ shellcheck -s bash scripts/install-git-hooks.sh (no output) $ npx commitlint --from origin/main --to HEAD (exit 0) ``` pre-commit (ruff, ruff format, mypy, commitlint) passed on the commit. ## Real Behavior Proof - Environment: macOS 27.2 arm64, git 2.x, bash 5; hooks installed by each version of `scripts/install-git-hooks.sh` into a throwaway repo with a bare remote; `make` stubbed to print instead of running the precheck. - Exact command / steps: install the hooks, push a `feature` branch with `--no-verify`, then run `git push origin --delete feature` and `git push origin HEAD:refs/heads/feature`, once with origin/main's script ( |
||
|
|
0f4275f8b3 |
fix(scripts): resolve hooks dir via git so install-git-hooks works in linked worktrees (#4176)
## Description `make install-git-hooks` fails in a linked Git worktree because `scripts/install-git-hooks.sh` checks for a literal `.git/hooks` directory. In a worktree `.git` is a file and the hooks live in the shared common dir, so the script exits before installing anything. The script now asks Git for the effective hooks directory (`git rev-parse --git-path hooks`) and writes the pre-push hook there. `pre-commit install` already handles worktrees. Closes #4161 ## Type of Change - [x] Bug fix (non-breaking change that fixes an issue) ## Changes Made - Resolve `HOOKS_DIR` with `git rev-parse --git-path hooks` instead of assuming `.git/hooks`; fail clearly when not in a git checkout. - Write `pre-push` to `$HOOKS_DIR` and print the real installed paths. - Ordinary checkouts are unchanged (still `.git/hooks`, same output). ## Testing - [x] Manual testing performed - [ ] Unit tests / ruff / mypy: N/A, shell-only change with no Python touched ### Test Output ```text # linked worktree, before $ ./scripts/install-git-hooks.sh error: .git/hooks/ not found — run from a git checkout root # linked worktree, after ✅ installed: /…/co/.git/hooks/pre-push pre-commit installed at /…/co/.git/hooks/pre-commit pre-commit installed at /…/co/.git/hooks/commit-msg # ordinary checkout, after (unchanged) ✅ installed: .git/hooks/pre-push ✅ installed: .git/hooks/pre-commit (repo pre-commit checks via pre-commit) # outside a git checkout error: not inside a git checkout — run from a Headroom git checkout ``` ## Real Behavior Proof - Environment: Linux x86_64, git 2.43.0, pre-commit from a venv - Exact command / steps: `git worktree add <dir> HEAD`, then `./scripts/install-git-hooks.sh` from the worktree; repeated in the main checkout and outside any repo - Observed result: hooks install into the shared common dir; a commit made in the worktree runs the pre-commit hooks (ruff/mypy hooks ran) - Not tested: macOS; a repo with `core.hooksPath` set (pre-commit refuses that config regardless) ## Runtime Rollout Safety - Rollout-managed feature(s): None. Developer tooling only (`scripts/install-git-hooks.sh`); no runtime code changes. - Minimum rollout channel: Stable. - Stable/default behavior changed: No. Proxy, library, and CLI behavior are untouched; ordinary checkouts install hooks to the same `.git/hooks` paths as before. - Kill switch / disable path: Not applicable. - Unsafe override required: No. - Qualification impact: None. - Rollback path: Revert this commit. ## Review Readiness - [x] I have performed a self-review - [x] This PR is ready for human review ## Checklist - [x] I have performed a self-review of my code - [x] I did **not** edit `CHANGELOG.md` ## Additional Notes No hook bypass: the same pre-commit, commit-msg and pre-push hooks are installed. <!-- devin-review-badge-begin --> --- <a href="https://app.devin.ai/review/headroomlabs-ai/headroom/pull/4176" target="_blank"><picture><source media="(prefers-color-scheme: dark)" srcset="https://static.devin.ai/assets/gh-devin-review-dark.svg?v=4"><img src="https://static.devin.ai/assets/gh-devin-review-light.svg?v=4" alt="Devin Review"></picture></a> <!-- devin-review-badge-end --> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: JD Davis <mxjerrett@gmail.com> |