Skip to content
Dependabot auto-merge

feat(aidd-vcs): add conflict resolution skill #1091

Sign in to view logs

feat(aidd-vcs): add conflict resolution skill

feat(aidd-vcs): add conflict resolution skill #1091

Workflow file for this run

.github/workflows/dependabot-auto-merge.yml at f482473
name: Dependabot auto-merge

Check warning on line 1 in .github/workflows/dependabot-auto-merge.yml

View workflow run for this annotation

GitHub Actions / Dependabot auto-merge

Workflow execution policy warning (evaluate mode) 

On November 2, 2026, GitHub will restrict `pull_request_target` on public repositories by default. To continue allowing the event trigger, configure an Actions policy. Learn more: https://gh.io/securely-using-pull_request_target#default-policy-for-pull_request_target
# Auto-merge for patch and minor Dependabot PRs; a major bump waits for a human. The PR
# still merges only once its required checks pass.
on:
pull_request_target:
types: [opened, synchronize, reopened]
permissions:
contents: write
pull-requests: write
jobs:
auto-merge:
if: github.actor == 'dependabot[bot]'
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0
id: app-token
with:
app-id: ${{ secrets.AIDD_BOT_APP_ID }}
private-key: ${{ secrets.AIDD_BOT_PRIVATE_KEY }}
- name: Dependabot metadata
id: meta
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
- name: Approve non-major updates
# A required-review ruleset blocks auto-merge until a review approves, and
# Dependabot never gets one. The app identity differs from the pull request author,
# so its approval counts.
if: steps.meta.outputs.update-type != 'version-update:semver-major'
run: gh pr review --approve "${{ github.event.pull_request.html_url }}"
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}
- name: Enable auto-merge for non-major updates
if: steps.meta.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --squash "${{ github.event.pull_request.html_url }}"
env:
GH_TOKEN: ${{ steps.app-token.outputs.token }}