From 382eba17e223d108aa2800e5dee94fc320a9406b Mon Sep 17 00:00:00 2001 From: Brian Holt Date: Fri, 18 Nov 2022 18:43:46 -0600 Subject: [PATCH] update mergify config to merge PRs from Dwolla's Scala Steward bot --- .mergify.yml | 6 ++++-- build.sbt | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 10d1dcb1b..6d05c1010 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,8 +8,10 @@ pull_request_rules: - name: merge scala-steward's PRs conditions: - - author=scala-steward - - body~=labels:.*early-semver-patch + - author=dwolla-oss-scala-steward[bot] + - or: + - body~=labels:.*early-semver-patch + - body~=labels:.*early-semver-minor - status-success=Build and Test (ubuntu-latest, 2.13, temurin@8) - status-success=Build and Test (ubuntu-latest, 2.12, temurin@8) actions: diff --git a/build.sbt b/build.sbt index 597b604f8..a0d51a371 100644 --- a/build.sbt +++ b/build.sbt @@ -14,6 +14,10 @@ ThisBuild / tlSonatypeUseLegacyHost := true ThisBuild / tlBaseVersion := "1.0" ThisBuild / githubWorkflowScalaVersions := Seq("2.13", "2.12") ThisBuild / tlCiReleaseBranches := Seq("main") +ThisBuild / mergifyStewardConfig ~= { _.map(_.copy( + author = "dwolla-oss-scala-steward[bot]", + mergeMinors = true, +))} tpolecatScalacOptions += ScalacOptions.release("8")