From 51c15f4b7b65d5788e33ad71ea46aa8ceaa624f5 Mon Sep 17 00:00:00 2001
From: David Ko <dko@suse.com>
Date: Wed, 7 Feb 2024 22:46:41 +0800
Subject: [PATCH 1/3] Create mergify.yml

Signed-off-by: David Ko <dko@suse.com>
---
 .github/mergify.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/mergify.yml

diff --git a/.github/mergify.yml b/.github/mergify.yml
new file mode 100644
index 00000000..0da48caa
--- /dev/null
+++ b/.github/mergify.yml
@@ -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}}? 🙏

From 83bf9676922d0129458847ea880707dbe30ae413 Mon Sep 17 00:00:00 2001
From: David Ko <dko@suse.com>
Date: Wed, 7 Feb 2024 22:55:22 +0800
Subject: [PATCH 2/3] Create codespell.yml

Signed-off-by: David Ko <dko@suse.com>
---
 .github/workflows/codespell.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/codespell.yml

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
new file mode 100644
index 00000000..6e4cca46
--- /dev/null
+++ b/.github/workflows/codespell.yml
@@ -0,0 +1,23 @@
+name: Codespell
+
+on:
+  push:
+  pull_request:
+    branches:
+    - master
+    - "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
+        ignore_words_file: .codespellignore
+        skip: "*/**.yaml,*/**.yml,./scripts,./vendor,MAINTAINERS,LICENSE,go.mod,go.sum"

From b4718be7c8a94629e374d9a0eda659c515620944 Mon Sep 17 00:00:00 2001
From: David Ko <dko@suse.com>
Date: Wed, 7 Feb 2024 23:06:12 +0800
Subject: [PATCH 3/3] Update codespell.yml

Signed-off-by: David Ko <dko@suse.com>
---
 .github/workflows/codespell.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml
index 6e4cca46..b1ab6b8e 100644
--- a/.github/workflows/codespell.yml
+++ b/.github/workflows/codespell.yml
@@ -1,10 +1,10 @@
 name: Codespell
 
 on:
-  push:
   pull_request:
     branches:
     - master
+    - main
     - "v*.*.*"
 
 jobs:
@@ -19,5 +19,4 @@ jobs:
       uses: codespell-project/actions-codespell@v2
       with:
         check_filenames: true
-        ignore_words_file: .codespellignore
         skip: "*/**.yaml,*/**.yml,./scripts,./vendor,MAINTAINERS,LICENSE,go.mod,go.sum"