Skip to content

Commit

Permalink
Merge template repository changes: remal-gradle-plugins/template (#483)
Browse files Browse the repository at this point in the history
Co-authored-by: remal-gradle-plugins <77341723+remal-gradle-plugins+sync-with-template@users.noreply.github.com>
  • Loading branch information
remal and remal-gradle-plugins authored Nov 6, 2024
1 parent 00525f5 commit c4a326e
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 2 deletions.
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,19 @@ build-cache/
.gradle/


# Kotlin:
.kotlin/


# NodeJS:
node_modules/


# IntelliJ IDEA plugins:
.intellijPlatform/
.qodana/


# IntelliJ:
/layout.json
/__placeholder__.js
Expand Down
28 changes: 26 additions & 2 deletions .mergify/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ pull_request_rules:
- -closed
- -merged
- -draft
- -locked
- '#changes-requested-reviews-by=0'
- check-success=cross-versions-tests-success
- check-success=WIP
- '#check-pending=0'
- '#check-failure=0'
- '#check-timed-out=0'
actions:
merge:
method: squash
Expand All @@ -45,13 +45,37 @@ pull_request_rules:
- -closed
- -merged
- -draft
- -locked
- '#changes-requested-reviews-by=0'
- check-success=cross-versions-tests-success
- check-success=WIP
- '#check-pending=0'
- '#check-failure=0'
- '#check-timed-out=0'
actions:
review: { }
merge:
method: squash

- name: Sync with template
conditions:
- author=remal
- label=sync-with-template
- '#added-files=0'
- '#removed-files=0'
- -conflict
- -closed
- -merged
- -draft
- '#changes-requested-reviews-by=0'
- check-success=cross-versions-tests-success
- check-success=WIP
- '#check-pending=0'
- '#check-failure=0'
- '#check-timed-out=0'
actions:
review: { }
merge:
method: squash


$schema: 'https://docs.mergify.com/mergify-configuration-schema.json'

0 comments on commit c4a326e

Please sign in to comment.