mirror of
https://github.com/JustArchiNET/ArchiSteamFarm
synced 2024-09-20 14:32:05 +00:00
Try different auto-merge action
Previous one clearly doesn't work correctly
This commit is contained in:
parent
a49adf93ee
commit
d63288d21b
3 changed files with 9 additions and 27 deletions
24
.github/workflows/auto-merge.yml
vendored
24
.github/workflows/auto-merge.yml
vendored
|
@ -1,26 +1,18 @@
|
|||
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
|
||||
- name: Checkout code
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
GITHUB_TOKEN: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
|
||||
PRESET: DEPENDABOT_MINOR
|
||||
submodules: recursive
|
||||
- name: Auto-merge PR if deemed appropriate
|
||||
uses: ahmadnassri/action-dependabot-auto-merge@v2
|
||||
with:
|
||||
github-token: ${{ secrets.ASF_GITHUB_PERSONAL_TOKEN }}
|
||||
target: minor
|
||||
|
|
10
.github/workflows/ci.yml
vendored
10
.github/workflows/ci.yml
vendored
|
@ -388,13 +388,3 @@ 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
|
||||
|
|
2
ASF-ui
2
ASF-ui
|
@ -1 +1 @@
|
|||
Subproject commit b6e2c360bc8c3553244f4f8f9e6ae4b026cbc9d6
|
||||
Subproject commit dfb979a9eee09c9ffc8ba9e8d1fee6e655685048
|
Loading…
Reference in a new issue