Skip to content

chore: Updated Dependabot config to group PRs and added workflow for scheduled auto-merge#140

Merged
Prajwal-Microsoft merged 3 commits intomainfrom
PSL-DependabotAutoMergeWorkflow
Jun 3, 2025
Merged

chore: Updated Dependabot config to group PRs and added workflow for scheduled auto-merge#140
Prajwal-Microsoft merged 3 commits intomainfrom
PSL-DependabotAutoMergeWorkflow

Conversation

@Rafi-Microsoft
Copy link
Copy Markdown
Contributor

Purpose

  • Introduced a scheduled GitHub Actions workflow to auto-approve and auto-merge Dependabot PRs targeting the dependabotchanges branch.
  • Also optimized the dependabot.yml configuration to group dependency updates by ecosystem and path, significantly reducing PR noise.
  • Enhanced rebase logic to handle merge conflicts using --strategy-option=theirs.
  • Implemented multi-strategy auto-merge (merge, squash, rebase) with fallback handling.
  • Improved overall script reliability and compatibility with repo-level merge restrictions.

Does this introduce a breaking change?

  • Yes
  • No

Golden Path Validation

  • I have tested the primary workflows (the "golden path") to ensure they function correctly without errors.

Deployment Validation

  • I have validated the deployment process successfully and all services are running as expected with this change.

What to Check

Verify that the following are valid

  • ...

Other Information

Comment thread .github/dependabot.yml Outdated
Comment thread .github/dependabot.yml
@Prajwal-Microsoft Prajwal-Microsoft merged commit bf4bfc7 into main Jun 3, 2025
6 checks passed
@github-actions
Copy link
Copy Markdown

github-actions Bot commented Jun 3, 2025

🎉 This PR is included in version 1.5.1 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@Prajwal-Microsoft Prajwal-Microsoft deleted the PSL-DependabotAutoMergeWorkflow branch June 25, 2025 05:15
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.

2 participants