aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorThomas Vigouroux <tomvig38@gmail.com>2021-07-18 18:30:35 +0200
committerThomas Vigouroux <tomvig38@gmail.com>2021-07-18 18:30:56 +0200
commite88f154dc4eac529291a5287ceb4c56d1bdeba53 (patch)
tree0bcf14ca67907a363118b78ac0985a555ecaa8e3 /.github
parentci(Mergify): configuration update (diff)
downloadnvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar.gz
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar.bz2
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar.lz
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar.xz
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.tar.zst
nvim-treesitter-e88f154dc4eac529291a5287ceb4c56d1bdeba53.zip
ci(Mergify): configuration update
Diffstat (limited to '.github')
-rw-r--r--.github/mergify.yml9
1 files changed, 8 insertions, 1 deletions
diff --git a/.github/mergify.yml b/.github/mergify.yml
index 78f5e3f2a..4d3b7791d 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -4,7 +4,14 @@ queue_rules:
- "#check-failure=0"
pull_request_rules:
- - name: Automatic merge on approval
+ - name: Merge lockfile updates
+ conditions:
+ - "title=Update lockfile.json"
+ actions:
+ merge:
+ method: merge
+
+ - name: Merge on approval
conditions:
- and:
- "-draft"