From b4accc13f2ca51a7752e157e188f863853a31757 Mon Sep 17 00:00:00 2001
From: Adriely Dourado <83427819+adriely-dourado@users.noreply.github.com>
Date: Fri, 29 Nov 2024 11:47:15 -0300
Subject: [PATCH] =?UTF-8?q?Remove=20o=20Kodiak=20e=20adiciona=20a=20config?=
 =?UTF-8?q?ura=C3=A7=C3=A3o=20de=20merge=20no=20workflow=20do=20GitHub=20(?=
 =?UTF-8?q?#91)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

issue [Configurar automerge dos PRs sem utilizar kodiak](https://github.com/monde-sistemas/melhorias/issues/349)
---
 .github/workflows/ci.yml | 16 ++++++++++++++++
 .kodiak.toml             | 14 --------------
 2 files changed, 16 insertions(+), 14 deletions(-)
 delete mode 100644 .kodiak.toml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1719b1..78b6eb1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,3 +27,19 @@ jobs:
       - name: Run tests
         run: |
           bin/rspec
+  merge:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'automerge') }}
+    runs-on: ubuntu-latest
+    needs: qa
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Merge pull request
+        uses: pascalgn/automerge-action@v0.16.4
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_LABELS: "automerge"
+          MERGE_METHOD: "squash"
+          MERGE_COMMIT_MESSAGE: "pull-request-title-and-description"
+          MERGE_DELETE_BRANCH: "true"
\ No newline at end of file
diff --git a/.kodiak.toml b/.kodiak.toml
deleted file mode 100644
index 4055c6e..0000000
--- a/.kodiak.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-# https://github.com/chdsbd/kodiak
-version = 1
-
-[approve]
-auto_approve_usernames = ["dependabot"]
-
-[merge]
-method = "squash"
-delete_branch_on_merge = true
-
-[merge.message]
-title = "pull_request_title"
-include_pr_number = true
-body = "pull_request_body"
\ No newline at end of file