Skip to content

fix(crane): allow protected files on PR branch pushes#122

Merged
mrjf merged 3 commits into
mainfrom
codex/allow-crane-protected-push
Jun 15, 2026
Merged

fix(crane): allow protected files on PR branch pushes#122
mrjf merged 3 commits into
mainfrom
codex/allow-crane-protected-push

Conversation

@mrjf

@mrjf mrjf commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Summary

  • allow Crane safe-output push-to-pull-request-branch to push protected files via protected-files: allowed
  • keep prompt guidance that protected workflow/config files introduced only by git merge origin/main are base-sync noise and should be restored before updating an existing Crane PR branch
  • recompile .github/workflows/crane.lock.yml with CI-pinned gh-aw v0.74.4
  • freeze a date-sensitive scheduler unit test so weekly scheduling assertions do not age into CI failures

Why

PR #119 failed because the safe-output patch included protected workflow/config files that were being brought in from main. Base-branch sync noise should not block migration progress, and the workflow should also avoid sending those protected-file changes when the migration does not explicitly target them.

Validation

  • /tmp/gh-aw-v0.74.4/gh-aw compile --no-check-update
  • .venv/bin/ruff format --check tests/unit/test_crane_scheduler.py tests/unit/test_crane_workflow_prompt.py
  • .venv/bin/ruff check src/ tests/
  • .venv/bin/pytest tests/unit/test_crane_scheduler.py tests/unit/test_crane_workflow_prompt.py tests/unit/test_migration_ci_workflow.py (22 passed)
  • git diff --check
  • GitHub PR checks passed: Lint, Python Unit Tests, Go Tests, Verify gh-aw locks, Detect Migration Changes, Crane / pre_activation

Repo Memory

Pushed memory/crane update 9899e050 to clear the paused state and mark the Python-to-Go migration ready to resume after this config PR lands.

@mrjf mrjf force-pushed the codex/allow-crane-protected-push branch from 9cf960d to 43f548b Compare June 15, 2026 07:20
@mrjf mrjf force-pushed the codex/allow-crane-protected-push branch from 43f548b to 8b374db Compare June 15, 2026 07:28
@mrjf mrjf merged commit d70027c into main Jun 15, 2026
21 checks passed
@mrjf mrjf deleted the codex/allow-crane-protected-push branch June 15, 2026 19:31
github-actions Bot added a commit that referenced this pull request Jun 18, 2026
…ration): add Go coverage for crane protected-files tests; advance upstream reviewed_sha

- Add TestGoCutoverRealCraneProtectedFilesConstraints in cmd/apm/crane_workflow_test.go
  to verify crane.md contains instructions for stripping protected workflow
  files from push patches and that push-to-pull-request-branch has
  protected-files: allowed
- Map two new Python tests added by #122 into python_test_coverage.json:
  test_crane_base_sync_strips_protected_workflow_files_from_push_patch
  test_crane_push_to_pr_branch_allows_protected_files
- Advance upstream_contract_coverage.yml reviewed_sha from 43a00c21 to
  637acb9a7ef6bf1915ad12e9c37750ad43800274 (current microsoft/apm@main)
  to fix upstream_freshness gate failure on PR #119

All three gates now pass locally: TestGoCutoverPythonTestConversionCoverage
reports 23783/23783 Python tests covered, upstream freshness will be
satisfied when reviewed_sha == current upstream SHA.

Run: https://github.com/githubnext/apm/actions/runs/27770631987

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant