Skip to content

Commit

Permalink
Update mergify (#101)
Browse files Browse the repository at this point in the history
* Update mergify

* Fix typo
  • Loading branch information
giswqs authored Aug 3, 2024
1 parent ccb3589 commit f3a7863
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 38 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docs-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

jobs:
deploy:
test-docs-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/installation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ on:
- main
- master


name: Linux installation
name: test-linux-installation
jobs:
test-ubuntu:
runs-on: ubuntu-latest
Expand Down
73 changes: 38 additions & 35 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,40 @@
pull_request_rules:
- name: CI automerge when passing all test
conditions:
# If the requirement are satisfied
# The bot will trigger automerge
- label=ready-to-merge
- check-success=ubuntu-latest (3.9)
- check-success=ubuntu-latest (3.10)
- check-success=ubuntu-latest (3.11)
- check-success=macOS-latest (3.11)
# Approval by reviewer at least one maintainer
# - "#approved-reviews-by>=1"
- base=main
actions:
comment:
# message if the pull request success to merge
message: Thanks for the contribution @{{author}} 🤩
label:
# adding label to merged pull request
add:
- already reviewed
merge:
method: squash
- name: CI automerge when passing all test
conditions:
# If the requirement are satisfied
# The bot will trigger automerge
- label=ready-to-merge
- check-success=ubuntu-latest (3.9)
- check-success=ubuntu-latest (3.10)
- check-success=ubuntu-latest (3.11)
- check-success=macOS-latest (3.11)
- check-success=test-windows
- check-success=test-docs-build
- check-success=test-linux-installation
# Approval by reviewer at least one maintainer
# - "#approved-reviews-by>=1"
- base=main
actions:
comment:
# message if the pull request success to merge
message: Thanks for the contribution @{{author}} 🤩
label:
# adding label to merged pull request
add:
- already reviewed
merge:
method: squash

- name: information about conflicts pull request
conditions:
# If the requirement are satisfied
# The bot will trigger conflict process
- conflict
actions:
comment:
# Message if there's conflict on pull request
message: your pull request are conflict @{{author}}, please fix it !
label:
# adding label on pull request if get trigger
add:
- conflicts pull request
- name: information about conflicts pull request
conditions:
# If the requirement are satisfied
# The bot will trigger conflict process
- conflict
actions:
comment:
# Message if there's conflict on pull request
message: Your pull request are conflict @{{author}}, please fix it!
label:
# adding label on pull request if get trigger
add:
- conflicts pull request

0 comments on commit f3a7863

Please sign in to comment.