Because:
- Workflow now stages a branch and opens an issue for manual PR
- Name and file should reflect current function
Renames workflow to 'Stage Branch for PR' and file to stage-branch-for-pr.yml. No breaking changes. Affects: .github/workflows/stage-branch-for-pr.yml
Because:
- requirements.txt was unsorted, making review and maintenance harder
- Workflow PR instructions were manual and unclear
Alphabetized requirements.txt main and dev sections, preserving all version pins and comments. Updated .github/workflows/create-upstream-pr.yml to open a GitHub issue for manual PR tracking, replacing console instructions. No breaking changes. requirements.txt, .github/workflows/create-upstream-pr.yml.
Because:
- Infra-only changes should not trigger PRs
- PRs should only be created for real code changes
Filters infra files from file count and summary. Skips PR creation if no code files or commits. Affects create-upstream-pr.yml. No breaking changes.
Because:
- PR summary did not enumerate changed files
- Improved clarity for reviewers
Adds formatted file list to changes summary in create-upstream-pr.yml. Removes redundant separator in PR body. No breaking changes. Affects only workflow file.
Because:
- Commits touching only infra files (all .github, cookbook/version_info.py, .gitattributes) should not be included in PR content
- Only commits with non-infra file changes still different from upstream should be included
Affects .github/workflows/create-upstream-pr.yml. No breaking changes. No test code affected.
Because:
- Infra file restore must occur before merge to avoid conflicts
- Redundant code file filtering step was unnecessary after infra reset
Moves infra file restore before merge in .github/workflows/create-upstream-pr.yml.
Removes filter step and updates downstream logic to use all changed files.
Improves comments and step clarity. No breaking changes.
Because:
- Previous workflow had duplicate and out-of-order steps
- Needed to ensure correct branch creation, upstream merge, and infra file reset
Refactors workflow to:
- Create branch and push to fork
- Merge upstream/tandoor-1 into new branch
- Restore infra files from upstream and push again
- Removes duplicate and redundant steps
Affects: .github/workflows/create-upstream-pr.yml
No breaking changes. No test code affected.
Because:
- GitHub Actions cannot push workflow file changes with default GITHUB_TOKEN
- GitHub App token is required for workflow file updates
Adds a step to generate a GitHub App token and uses it for pushing the branch. Follows the pattern from dependabot-automerge.yml. Affects create-upstream-pr.yml. No breaking changes. All PRs will now be able to push workflow file changes if needed.
Because:
- PRs must never add, modify, or delete infrastructure files
- Infra file logic, counting, and removal is not needed
- Reset infra files to upstream state before push
Removes all logic for infra file tracking, counting, and removal. Now only code files are included in PRs. Infra files are always reset to upstream/tandoor-1 before push. Affects create-upstream-pr.yml. No breaking changes. All PRs will now be infra-clean by construction.
Because:
- PR title and body were not set as outputs in github-script step
- Downstream steps require outputs for correct PR instructions
- Each line under 72 chars
Adds core.setOutput for prTitle and prBody in build_pr_content. Affects .github/workflows/create-upstream-pr.yml. No breaking changes.
Because:
- Old logic tried to find a PR for the triggering commit, which never exists
- Upstream maintainers need a summary of all commits in the branch
- Each line under 72 chars
Removes get_trigger_pr step and builds PR title/body from commit list. Affects .github/workflows/create-upstream-pr.yml. No breaking changes.
Because:
- Automated PR creation from forks is blocked by GitHub permissions
- Users need clear, actionable instructions to open PRs manually
Removes automated PR creation and related steps. Adds a step to print a direct PR link and suggested title/body after branch push. Only .github/workflows/create-upstream-pr.yml affected. No breaking changes.
Because:
- Downstream steps require valid JSON arrays for code/infrastructure files
- Previous jq usage could produce malformed output
Updates .github/workflows/create-upstream-pr.yml to use 'jq -sc' for correct array output in code/infrastructure file filtering. No breaking changes. No follow-up required.
Because:
- GitHub Actions scripts require valid JSON for file lists
- Prevents JSON.parse errors in github-script steps
Now uses jq to emit code_files and infra_files as JSON arrays in filter_files step. Affects .github/workflows/create-upstream-pr.yml. No breaking changes.
Because:
- GitHub Actions cannot push workflow files from forks due to permission restrictions
- Prevents workflow errors and keeps upstream infrastructure intact
Adds a step to remove .github, cookbook/version_info.py, and .gitattributes before pushing to fork. Only code changes are pushed for upstream PR. Affects .github/workflows/create-upstream-pr.yml. No breaking changes.
Because:
- Only create-upstream-pr.yml should be used for upstream PR automation
- upstream-pr.yml enforced divergence checks and manual sync, causing confusion
Deletes .github/workflows/upstream-pr.yml. Ensures only the updated workflow logic is used. No breaking changes. No impact on code or tests.
Because:
- Diverged branches are not a blocker if merge is clean
- Previous logic blocked on divergence, not actual conflicts
Updates .github/workflows/create-upstream-pr.yml to only fail if a merge conflict occurs during upstream merge. No longer blocks or warns on branch divergence alone. No breaking changes. Workflow now matches real merge safety requirements.
Because:
- Merge conflicts in infrastructure files caused manual intervention
- Upstream infra files must always be preferred to avoid drift
Moves 'Restore upstream infrastructure files' step before 'Merge upstream branch' in create-upstream-pr.yml. Ensures .github/workflows/ and cookbook/version_info.py are always restored from upstream before merging. No breaking changes. Affects .github/workflows/create-upstream-pr.yml only.
