Merge pull request #394 from softwaremill/mergify-removal

Removed mergify

Author: Pask423

.github/labeler.yml

@@ -0,0 +1,14 @@
+version: 1
+labels:
+  - label: "automerge"
+    authors: ["softwaremill-ci"]
+    files:
+      - "build.sbt"
+      - "project/plugins.sbt"
+      - "project/build.properties"
+  - label: "dependency"
+    authors: ["softwaremill-ci"]
+    files:
+      - "build.sbt"
+      - "project/plugins.sbt"
+      - "project/build.properties"

.github/workflows/ci.yml

@@ -135,3 +135,41 @@ jobs:
           find $HOME/.ivy2/cache                       -name "*-LM-SNAPSHOT*"       -delete || true
           find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
           find $HOME/.sbt                              -name "*.lock"               -delete || true
+
+  # `automerge` label is attached iff there is exactly one file changed by steward and this file belongs to a
+  # whitelist specified by `labeler.yml`
+  label:
+    name: Attach automerge label
+    # only for PRs by softwaremill-ci
+    if: github.event.pull_request.user.login == 'softwaremill-ci'
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+      # count number of files changed
+      - name: Count number of files changed
+        id: count-changed-files
+        run: |
+          N=$(git diff --name-only -r HEAD^1 HEAD | wc -w)
+          echo "changed_files_num=$N" >> $GITHUB_OUTPUT
+      - name: Launch labeler
+        # skip if more than one file changed
+        if: steps.count-changed-files.outputs.changed_files_num == 1
+        uses: srvaroa/labeler@master
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+
+  auto-merge:
+    name: Auto merge
+    # only for PRs by softwaremill-ci
+    if: github.event.pull_request.user.login == 'softwaremill-ci'
+    needs: [ ci, mima, label ]
+    runs-on: ubuntu-22.04
+    steps:
+      - id: automerge
+        name: automerge
+        uses: "pascalgn/[email protected]"
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          MERGE_METHOD: "squash"

.mergify.yml

@@ -15,10 +15,7 @@ val sttpModelVersion = "1.7.10"
 val scalaTestVersion = "3.2.18"
 val zio1Version = "1.0.18"
 val zio2Version = "2.0.22"
-val fs2_2_version: Option[(Long, Long)] => String = {
-  case Some((2, 11)) => "2.1.0"
-  case _             => "2.5.9"
-}
+val fs2_2_version = "2.5.9"
 val fs2_3_version = "3.10.0"
 val armeriaVersion = "1.28.4"
 
@@ -170,16 +167,12 @@ lazy val armeria = (projectMatrix in file("armeria"))
 lazy val fs2ce2 = (projectMatrix in file("fs2-ce2"))
   .settings(
     name := "fs2-ce2",
-    libraryDependencies ++= dependenciesFor(scalaVersion.value)(
-      "co.fs2" %%% "fs2-core" % fs2_2_version(_)
-    )
+    libraryDependencies += "co.fs2" %%% "fs2-core" % fs2_2_version
   )
   .jvmPlatform(
     scalaVersions = scala2 ++ scala3,
     settings = commonJvmSettings ++ Seq(
-      libraryDependencies ++= dependenciesFor(scalaVersion.value)(
-        "co.fs2" %% "fs2-io" % fs2_2_version(_)
-      )
+      libraryDependencies +="co.fs2" %% "fs2-io" % fs2_2_version
     )
   )
   .jsPlatform(