Skip to content

Commit

Permalink
Merge branch 'longhorn:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
DamiaSan authored Feb 8, 2024
2 parents d67b39e + b4718be commit 3f84c15
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 0 deletions.
19 changes: 19 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
pull_request_rules:
- name: automatic merge after review
conditions:
- check-success=continuous-integration/drone/pr
- check-success=DCO
- check-success=CodeFactor
- check-success=codespell
- "#approved-reviews-by>=2"
- approved-reviews-by=@longhorn/maintainer
actions:
merge:
method: rebase

- name: ask to resolve conflict
conditions:
- conflict
actions:
comment:
message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏
22 changes: 22 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Codespell

on:
pull_request:
branches:
- master
- main
- "v*.*.*"

jobs:
codespell:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Check code spell
uses: codespell-project/actions-codespell@v2
with:
check_filenames: true
skip: "*/**.yaml,*/**.yml,./scripts,./vendor,MAINTAINERS,LICENSE,go.mod,go.sum"

0 comments on commit 3f84c15

Please sign in to comment.