Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/pr-review-merge-scheduler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -609,9 +609,20 @@ jobs:
continue
fi

# The scheduler requires --project-flow. Derive it per target the
# same way the single-repository job does: main/master default
# branches are GitHub Flow, develop is Git Flow, anything else
# defaults to GitHub Flow.
case "$default_branch" in
main|master) project_flow="github-flow" ;;
develop) project_flow="git-flow" ;;
*) project_flow="github-flow" ;;
esac

args=(
--repo "$repo_full_name"
--base-branch "$default_branch"
--project-flow "$project_flow"
--max-prs "$ORG_SWEEP_MAX_PRS"
--review-workflow "Required OpenCode Review"
--review-dispatch-limit "$ORG_SWEEP_REVIEW_DISPATCH_LIMIT"
Expand Down
6 changes: 6 additions & 0 deletions tests/test_required_workflow_queue_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ def test_org_queue_sweep_covers_target_repositories_on_a_heartbeat() -> None:
# Queue hygiene: stale queued runs are cancelled with a logged identity.
assert "ORG_SWEEP_STALE_QUEUE_HOURS" in workflow
assert "/actions/runs?status=queued&per_page=100" in workflow
# The scheduler requires --project-flow; the sweep must derive and pass it
# per target repository (regression: the first sweep failed every repo with
# "--project-flow is required").
assert "--project-flow" in workflow
assert 'main|master) project_flow="github-flow"' in workflow
assert 'develop) project_flow="git-flow"' in workflow


def test_fix_scheduler_cancels_superseded_cron_runs() -> None:
Expand Down
Loading