From 871b19813094d3c67c94fab4d1de36772c46eee2 Mon Sep 17 00:00:00 2001 From: mmeest Date: Wed, 9 Sep 2026 12:11:12 +0300 Subject: [PATCH] Auto-merge Dependabot and Renovate patch and minor PRs when CI is green. Major updates still require a manual review. Tests must pass before merge. Co-authored-by: Cursor --- .github/workflows/auto-merge.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index fddd992f62..0ae032a11e 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -46,23 +46,23 @@ jobs: UPDATE_TYPE="${{ steps.metadata.outputs.update-type || 'unknown' }}" if [ "$PR_AUTHOR" == "dependabot[bot]" ]; then - if [[ "$UPDATE_TYPE" == "version-update:semver-patch" ]]; then + if [[ "$UPDATE_TYPE" == "version-update:semver-patch" || "$UPDATE_TYPE" == "version-update:semver-minor" ]]; then echo "auto_merge=true" >> $GITHUB_OUTPUT echo "update_type=${UPDATE_TYPE}" >> $GITHUB_OUTPUT - echo "Auto-merge: Dependabot patch update detected" + echo "Auto-merge: Dependabot patch or minor update detected" else echo "auto_merge=false" >> $GITHUB_OUTPUT echo "update_type=${UPDATE_TYPE}" >> $GITHUB_OUTPUT - echo "Auto-merge: Dependabot non-patch update, skipping" + echo "Auto-merge: Dependabot major or non-semver update, skipping" fi elif [ "$PR_AUTHOR" == "renovate[bot]" ]; then LABELS=$(gh pr view ${{ github.event.pull_request.number }} --json labels -q '.labels[].name' | tr '\n' ' ') - if [[ "$LABELS" == *"patch"* ]] && [[ "$LABELS" != *"minor"* ]] && [[ "$LABELS" != *"major"* ]]; then + if [[ "$LABELS" != *"major"* ]] && ( [[ "$LABELS" == *"patch"* ]] || [[ "$LABELS" == *"minor"* ]] ); then echo "auto_merge=true" >> $GITHUB_OUTPUT - echo "update_type=renovate-patch-only" >> $GITHUB_OUTPUT + echo "update_type=renovate-patch-or-minor" >> $GITHUB_OUTPUT else echo "auto_merge=false" >> $GITHUB_OUTPUT - echo "update_type=renovate-non-patch-or-mixed" >> $GITHUB_OUTPUT + echo "update_type=renovate-major-or-unlabeled" >> $GITHUB_OUTPUT fi else echo "auto_merge=false" >> $GITHUB_OUTPUT