squash Typelevel Steward PRs to keep commit history clean

typelevel · Jan 18, 2023 · d0442d8 · d0442d8
1 parent 1925cc0
commit d0442d8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -23,7 +23,8 @@ pull_request_rules:
   - status-success=Build and Test (ubuntu-latest, 3, temurin@17, rootNative)
   - '#approved-reviews-by>=1'
   actions:
-    merge: {}
+    merge:
+      method: squash
 - name: Label core PRs
   conditions:
   - files~=^core/

diff --git a/build.sbt b/build.sbt
@@ -19,7 +19,7 @@ ThisBuild / githubWorkflowScalaVersions := Seq("2.13", "2.12", "3")
 ThisBuild / tlJdkRelease := Some(8)
 
 ThisBuild / mergifyStewardConfig ~= {
-  _.map(_.copy(mergeMinors = true, author = "typelevel-steward[bot]"))
+  _.map(_.copy(mergeMinors = true, author = "typelevel-steward[bot]", action = MergifyAction.Merge(method = Option("squash"))))
 }
 ThisBuild / mergifySuccessConditions += MergifyCondition.Custom("#approved-reviews-by>=1")
 ThisBuild / mergifyPrRules += MergifyPrRule(