Skip to content

Commit

Permalink
testing mergify
Browse files Browse the repository at this point in the history
  • Loading branch information
Ce11an committed May 1, 2024
1 parent 673682a commit 2cee3b9
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 1 deletion.
66 changes: 66 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
queue_rules:
- name: default
checks_timeout: 8 h
merge_method: squash
queue_conditions:
- check-success=Summary
- check-success=hello-world-pr
priority_rules:
- name: default
conditions:
- -label=flag:urgent
priority: medium
- name: urgent
conditions:
- label=flag:urgent
priority: high
branch_protection_injection_mode: merge
merge_conditions:
- "#commits-behind==0"
- "label=flag:merge"
- check-success=hello-world-pr
- check-success=hello-world

pull_request_rules:
- name: add-to-merge-queue
conditions:
- -draft
- -closed
- -merged
- -conflict
- base=main
- label=flag:merge
actions:
queue:
- name: remove-merge-on-failure
conditions:
- -closed
- -merged
- -conflict
- base=main
- check-failure=hello-world-pr
- check-success!=hello-world-pr
- -label=flag:urgent
- label=flag:merge
- "#commits-behind=0"
- queue-position=0
actions:
label:
remove:
- flag:merge
- name: remove-merge-label-conflict
conditions:
- -closed
- -merged
- base=main
- -label=flag:urgent
- label=flag:merge
- conflict
actions:
comment:
message: The PR has a conflict, removing flag merge.
label:
remove:
- flag:merge


14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
name: main

on:
push:
branches:
- main

jobs:
hello-world:
runs-on: ubuntu-latest
steps:
- name: say-hello-world
run: echo "Hello World!"

13 changes: 13 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: pr

on:
pull_request:
branches:
- main

jobs:
hello-world-pr:
runs-on: ubuntu-latest
steps:
- name: say-hello-world
run: echo "Hello World!"
2 changes: 1 addition & 1 deletion .gitignore_global
Original file line number Diff line number Diff line change
Expand Up @@ -198,4 +198,4 @@ Brewfile.lock.json
*.zip
*.~*
*~

# test
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ stow .
- [kickstart.nvim](https://github.com/nvim-lua/kickstart.nvim)
- [brew-bundle-brewfile-tips.md](https://gist.github.com/ChristopherA/a579274536aab36ea9966f301ff14f3f#)

bump 1

0 comments on commit 2cee3b9

Please sign in to comment.