feat(workflow): Add PR management automation by DrunkOnJava · Pull Request #245 · DrunkOnJava/ModularHomeInventory

DrunkOnJava · 2025-07-31T22:19:09Z

🤖 PR Management Workflow

This PR adds comprehensive PR management automation to support the hybrid workflow model.

What this adds:

Auto-labeling system:
- Size labels (XS to XL based on line changes)
- Target branch labels (main vs dev)
- Type labels based on branch naming conventions
Contextual PR feedback:
- Different guidelines for PRs to main vs dev
- Warnings for large PRs (>500 lines)
- Clear review process expectations
Smart auto-merge for dev:
- Only for approved PRs under 200 lines
- Requires all checks to pass
- Falls back gracefully with error messages
Conflict detection:
- Automatic conflict detection on PR updates
- Resolution guidance with commands
- Conflict status labeling
Stale PR management:
- 7-day warning period
- 14-day auto-close with notification
- Manual trigger via workflow dispatch

Why this is needed:

The hybrid workflow requires different handling for PRs targeting main vs dev. This automation:

Reduces manual PR management overhead
Provides consistent labeling and feedback
Speeds up development on dev branch while maintaining main stability
Helps prevent PR backlog through stale management

Configuration:

Auto-merge is limited to dev branch only
Size thresholds can be adjusted based on team preferences
Stale timings are configurable (currently 7/14 days)

This is Part 2 of 5 of the hybrid workflow implementation.

Implements smart PR automation while maintaining human oversight for critical decisions.

github-actions · 2025-07-31T22:19:18Z

👋 Welcome to the Hybrid Workflow!

⚠️ Important: This PR targets main directly. Please ensure:

This is a critical fix or thoroughly tested feature
All tests pass
You've considered creating this PR to dev first

PR Guidelines

Keep PRs focused on a single feature or fix
Ensure all tests pass before review
Update documentation if needed
Respond to review feedback promptly

Review Process

PRs to main require:

Approved review from maintainer
All status checks passing
No merge conflicts

github-actions · 2025-07-31T22:19:56Z

🔍 PR Validation Results

Build Status: ❌ Failed
SwiftLint: ⚠️ Issues found
Project Structure: ❌ Issues found
Compilation: ❌ Failed

This comment was automatically generated by the PR validation workflow.

Copilot

Pull Request Overview

This PR implements comprehensive GitHub workflow automation for PR management, supporting a hybrid development workflow with different handling for PRs targeting main vs dev branches.

Automated PR labeling system based on size, target branch, and source branch naming conventions
Contextual feedback and guidelines for newly opened PRs with special handling for large PRs and main branch targets
Smart auto-merge functionality for small approved PRs to the dev branch with fallback error handling

Copilot · 2025-07-31T22:20:01Z

.github/workflows/pr-management.yml

+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: pr.number,
+                body: `⚠️ **Merge conflicts detected!**\n\nThis PR has conflicts with the base branch that must be resolved.\n\n### To resolve:\n\`\`\`bash\ngit checkout ${pr.head.ref}\ngit fetch origin\ngit rebase origin/${pr.base.ref}\n# Fix conflicts\ngit push --force-with-lease\n\`\`\`\n\nNeed help? Check our [conflict resolution guide](../docs/CONFLICT_RESOLUTION.md).`


The link to the conflict resolution guide uses a relative path ../docs/CONFLICT_RESOLUTION.md which may not resolve correctly from a GitHub comment. Consider using an absolute URL or removing the link if the documentation doesn't exist.

Suggested change

body: `⚠️ **Merge conflicts detected!**\n\nThis PR has conflicts with the base branch that must be resolved.\n\n### To resolve:\n\`\`\`bash\ngit checkout ${pr.head.ref}\ngit fetch origin\ngit rebase origin/${pr.base.ref}\n# Fix conflicts\ngit push --force-with-lease\n\`\`\`\n\nNeed help? Check our [conflict resolution guide](../docs/CONFLICT_RESOLUTION.md).`

body: `⚠️ **Merge conflicts detected!**\n\nThis PR has conflicts with the base branch that must be resolved.\n\n### To resolve:\n\`\`\`bash\ngit checkout ${pr.head.ref}\ngit fetch origin\ngit rebase origin/${pr.base.ref}\n# Fix conflicts\ngit push --force-with-lease\n\`\`\`\n\nNeed help? Check our [conflict resolution guide](https://github.com/<owner>/<repo>/blob/main/docs/CONFLICT_RESOLUTION.md).`

Copilot · 2025-07-31T22:20:01Z

.github/workflows/pr-management.yml

+            const allChecksPassed = checks.check_runs.every(
+              check => check.status === 'completed' && check.conclusion === 'success'
+            );


The auto-merge logic only checks check_runs but ignores status checks from the legacy status API. This could cause auto-merge to proceed when some status checks haven't passed. Consider also checking github.rest.repos.getCombinedStatusForRef() for complete validation.

Suggested change

const allChecksPassed = checks.check_runs.every(

check => check.status === 'completed' && check.conclusion === 'success'

);

// Fetch combined status from the legacy status API

const { data: combinedStatus } = await github.rest.repos.getCombinedStatusForRef({

owner: context.repo.owner,

repo: context.repo.repo,

ref: pr.head.sha

});

const allChecksPassed = checks.check_runs.every(

check => check.status === 'completed' && check.conclusion === 'success'

) && combinedStatus.state === 'success';

Copilot · 2025-07-31T22:20:01Z

.github/workflows/pr-management.yml

+
+            for (const pr of pullRequests) {
+              const updatedAt = new Date(pr.updated_at);
+              const daysSinceUpdate = (now - updatedAt) / (1000 * 60 * 60 * 24);


[nitpick] The magic number (1000 * 60 * 60 * 24) for milliseconds in a day should be extracted to a named constant for better readability and maintainability.

Suggested change

const daysSinceUpdate = (now - updatedAt) / (1000 * 60 * 60 * 24);

const daysSinceUpdate = (now - updatedAt) / MILLISECONDS_IN_A_DAY;

Copilot · 2025-07-31T22:20:02Z

.github/workflows/pr-management.yml

+              check => check.status === 'completed' && check.conclusion === 'success'
+            );
+
+            if (!allChecksPassed) {


When there are no check runs, checks.check_runs.every() will return true, potentially allowing auto-merge when no checks have actually run. Consider checking if checks.check_runs.length > 0 before evaluating the results.

Add comprehensive PR management workflow to support hybrid development: - Auto-labeling by size, target branch, and type - PR feedback with guidelines based on target branch - Auto-merge for small approved PRs to dev (< 200 lines) - Conflict detection with resolution guidance - Stale PR management (7-day warning, 14-day close) This workflow balances automation with human oversight, making PR management more efficient while maintaining code quality standards. Part 2 of the hybrid workflow implementation. Co-authored-by: Claude <claude@anthropic.com>

github-actions · 2025-07-31T23:11:00Z

🔍 PR Validation Results

Build Status: ✅ Passed
SwiftLint: ⚠️ Issues found
Project Structure: ❌ Issues found
Compilation: ❌ Failed

This comment was automatically generated by the PR validation workflow.

Copilot AI review requested due to automatic review settings July 31, 2025 22:19

github-actions bot added size/L target/main needs-careful-review type/feature labels Jul 31, 2025

Copilot AI reviewed Jul 31, 2025

View reviewed changes

This was referenced Jul 31, 2025

feat(hooks): Add Git hooks installation system #248

Merged

fix(ci): Only run Swift checks on PRs with Swift changes #250

Merged

DrunkOnJava force-pushed the feat/pr-management-workflow branch from a006209 to e2497d5 Compare July 31, 2025 23:10

github-actions bot added size/L and removed size/L labels Jul 31, 2025

DrunkOnJava merged commit 10c4887 into main Jul 31, 2025
7 of 9 checks passed

DrunkOnJava deleted the feat/pr-management-workflow branch July 31, 2025 23:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(workflow): Add PR management automation#245

feat(workflow): Add PR management automation#245
DrunkOnJava merged 1 commit intomainfrom
feat/pr-management-workflow

DrunkOnJava commented Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	const daysSinceUpdate = (now - updatedAt) / (1000 * 60 * 60 * 24);
	const daysSinceUpdate = (now - updatedAt) / MILLISECONDS_IN_A_DAY;

Conversation

DrunkOnJava commented Jul 31, 2025

🤖 PR Management Workflow

What this adds:

Why this is needed:

Configuration:

Uh oh!

github-actions bot commented Jul 31, 2025

👋 Welcome to the Hybrid Workflow!

PR Guidelines

Review Process

Uh oh!

github-actions bot commented Jul 31, 2025

🔍 PR Validation Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 31, 2025

🔍 PR Validation Results

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants