From e8efb7b013dd5dac368e4a7000efc9f6cfd77f40 Mon Sep 17 00:00:00 2001
From: Alex Collins <alex_collins@intuit.com>
Date: Sat, 26 Mar 2022 09:54:30 -0700
Subject: [PATCH] chore: update automation

---
 .github/workflows/changelog-reviewer.yml  | 4 ++--
 .github/workflows/dependabot-reviewer.yml | 4 ++--
 .github/workflows/governance.yml          | 2 ++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/changelog-reviewer.yml b/.github/workflows/changelog-reviewer.yml
index 701fe063..962662c5 100644
--- a/.github/workflows/changelog-reviewer.yml
+++ b/.github/workflows/changelog-reviewer.yml
@@ -7,12 +7,12 @@ permissions:
   contents: write
 
 jobs:
-  dependabot:
+  review:
     runs-on: ubuntu-latest
     if: "${{ github.actor == 'github-actions[bot]' && github.event.pull_request.title == 'docs: updated CHANGELOG.md' }}"
     steps:
       - name: Merge PR
-        run: gh pr merge --admin --merge "$PR_URL"
+        run: gh pr merge --admin --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
diff --git a/.github/workflows/dependabot-reviewer.yml b/.github/workflows/dependabot-reviewer.yml
index f3ef0c50..a18364cb 100644
--- a/.github/workflows/dependabot-reviewer.yml
+++ b/.github/workflows/dependabot-reviewer.yml
@@ -7,7 +7,7 @@ permissions:
   contents: write
 
 jobs:
-  dependabot:
+  review:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
@@ -22,7 +22,7 @@ jobs:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
       - name: Enable auto-merge for Dependabot PRs
-        run: gh pr merge --auto --merge "$PR_URL"
+        run: gh pr merge --auto --squash "$PR_URL"
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
diff --git a/.github/workflows/governance.yml b/.github/workflows/governance.yml
index 79f02030..56b22760 100644
--- a/.github/workflows/governance.yml
+++ b/.github/workflows/governance.yml
@@ -1,4 +1,6 @@
 # https://github.com/DeFiCh/oss-governance-bot
+name: Governance Bot
+
 on:
   issues:
     types: [ opened, labeled, unlabeled ]