diff --git a/.mergify.yml b/.mergify.yml index 77d6ae8..a7ff540 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -1,22 +1,7 @@ -merge_queue: - queue_controls_comment: false - -queue_rules: - - name: default - merge_conditions: - - check-success ~= ^Build and Test.*$ - pull_request_rules: - - name: queue PRs marked for merge - conditions: - - label = merge-on-build-success - actions: - queue: - name: default - - - name: auto-queue Scala Steward PRs + - name: merge Scala Steward PRs conditions: - author = scala-steward + - status-success ~= ^Build and Test.*$ actions: - queue: - name: default + merge: {} diff --git a/.scala-steward.conf b/.scala-steward.conf new file mode 100644 index 0000000..581b656 --- /dev/null +++ b/.scala-steward.conf @@ -0,0 +1,3 @@ +updates.ignore = [ + { groupId = "org.scalameta", artifactId = "scalafmt-core" } +] diff --git a/.scalafmt.conf b/.scalafmt.conf index a8424ee..37693d6 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version="3.11.1" +version="3.11.4" maxColumn = 120 trailingCommas = always continuationIndent.defnSite = 2