Try different auto-merge action

Previous one clearly doesn't work correctly
This commit is contained in:
JustArchi 2020-09-27 02:35:38 +02:00
parent a49adf93ee
commit d63288d21b
3 changed files with 9 additions and 27 deletions

View file

@ -1,26 +1,18 @@
name: ASF-auto-merge name: ASF-auto-merge
on: on:
check_suite:
types:
- completed
pull_request: pull_request:
types:
- edited
- labeled
- opened
- ready_for_review
- reopened
- synchronize
- unlabeled
- unlocked
jobs: jobs:
auto-merge: auto-merge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Auto-merge PR if deemed appropriate - name: Checkout code
uses: ridedott/merge-me-action@v1.6.7 uses: actions/checkout@v2
with: with:
GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }} submodules: recursive
PRESET: DEPENDABOT_MINOR - name: Auto-merge PR if deemed appropriate
uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
github-token: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
target: minor

View file

@ -388,13 +388,3 @@ jobs:
asset_path: out/ASF-win-x64.zip asset_path: out/ASF-win-x64.zip
asset_name: ASF-win-x64.zip asset_name: ASF-win-x64.zip
asset_content_type: application/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

2
ASF-ui

@ -1 +1 @@
Subproject commit b6e2c360bc8c3553244f4f8f9e6ae4b026cbc9d6 Subproject commit dfb979a9eee09c9ffc8ba9e8d1fee6e655685048