Merge pull request #3510 from scala-steward/update/sbt-typelevel-merg…

…ify-0.7.5

.github/workflows/ci.yml

@@ -24,23 +24,23 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.13]
         java: [temurin@21, temurin@17, temurin@11]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@21)
         id: setup-java-temurin-21
         if: matrix.java == 'temurin@21'
@@ -116,18 +116,18 @@ jobs:
     if: github.event_name != 'pull_request' && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v'))
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@21]
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install sbt
-        uses: sbt/setup-sbt@v1
-
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Setup sbt
+        uses: sbt/setup-sbt@v1
+
       - name: Setup Java (temurin@21)
         id: setup-java-temurin-21
         if: matrix.java == 'temurin@21'

.mergify.yml

@@ -21,9 +21,9 @@ pull_request_rules:
   - or:
     - author=scala-steward
     - author=scala-steward-dev
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@21)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@21)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@17)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@11)
   actions:
     merge:
       method: merge

project/plugins.sbt

@@ -11,6 +11,6 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
 addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.2")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.5")
 
 ThisBuild / evictionErrorLevel := Level.Info