diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml new file mode 100644 index 000000000..d6347d833 --- /dev/null +++ b/.github/workflows/auto-merge.yml @@ -0,0 +1,26 @@ +name: ASF-auto-merge + +on: + check_suite: + types: + - completed + pull_request: + types: + - edited + - labeled + - opened + - ready_for_review + - reopened + - synchronize + - unlabeled + - unlocked + +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + - name: Auto-merge PR if deemed appropriate + uses: ridedott/merge-me-action@v1.6.7 + with: + GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }} + PRESET: DEPENDABOT_MINOR diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de7208f87..35b524452 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -388,3 +388,13 @@ jobs: asset_path: out/ASF-win-x64.zip asset_name: ASF-win-x64.zip asset_content_type: application/zip + auto-merge: + needs: + - main + runs-on: ubuntu-latest + steps: + - name: Auto-merge PR if deemed appropriate + uses: ridedott/merge-me-action@v1.6.7 + with: + GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }} + PRESET: DEPENDABOT_MINOR