From 8a5402997a4f64b362539edf145a860d5dd78cd6 Mon Sep 17 00:00:00 2001
From: "http4s-steward[bot]"
 <106843772+http4s-steward[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:10:41 +0000
Subject: [PATCH 1/2] Update sbt-typelevel-mergify to 0.7.5 in series/0.10

---
 project/plugins.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/plugins.sbt b/project/plugins.sbt
index 8707c196..e90b98fa 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,2 +1,2 @@
 addSbtPlugin("org.http4s" % "sbt-http4s-org" % "0.17.5")
-addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.4")
+addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.7.5")

From f1335c004769f61931e44c05240191111bc30d62 Mon Sep 17 00:00:00 2001
From: "http4s-steward[bot]"
 <106843772+http4s-steward[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2024 20:11:04 +0000
Subject: [PATCH 2/2] Regenerate GitHub Actions workflow

Executed command: sbt githubWorkflowGenerate
---
 .github/workflows/ci.yml | 40 ++++++++++++++++++++--------------------
 .mergify.yml             | 12 ++++++------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 148e6ca2..a2adbc49 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,11 +24,11 @@ concurrency:
 
 jobs:
   build:
-    name: Build and Test
+    name: Test
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         scala: [2.12, 2.13, 3]
         java: [temurin@11, temurin@17, temurin@21]
         exclude:
@@ -43,14 +43,14 @@ jobs:
     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@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -94,18 +94,18 @@ jobs:
         run: sbt githubWorkflowCheck
 
       - name: Check headers and formatting
-        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
 
       - name: Test
         run: sbt '++ ${{ matrix.scala }}' test
 
       - name: Check binary compatibility
-        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' mimaReportBinaryIssues
 
       - name: Generate API documentation
-        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == 'temurin@11' && matrix.os == 'ubuntu-22.04'
         run: sbt '++ ${{ matrix.scala }}' doc
 
       - name: Check scalafix lints
@@ -137,18 +137,18 @@ jobs:
     if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/series/0.10')
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     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@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -247,18 +247,18 @@ jobs:
     if: github.event.repository.fork == false && github.event_name != 'pull_request'
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     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@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
@@ -308,18 +308,18 @@ jobs:
     name: Generate Site
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-22.04]
         java: [temurin@11]
     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@11)
         id: setup-java-temurin-11
         if: matrix.java == 'temurin@11'
diff --git a/.mergify.yml b/.mergify.yml
index a2fb1382..917126bf 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -10,12 +10,12 @@ pull_request_rules:
   conditions:
   - author=http4s-steward[bot]
   - body~=labels:.*early-semver-patch
-  - status-success=Build and Test (ubuntu-latest, 2.12, temurin@11)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@11)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@17)
-  - status-success=Build and Test (ubuntu-latest, 2.13, temurin@21)
-  - status-success=Build and Test (ubuntu-latest, 3, temurin@11)
-  - status-success=Generate Site (ubuntu-latest, temurin@11)
+  - status-success=Test (ubuntu-22.04, 2.12, temurin@11)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@11)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@17)
+  - status-success=Test (ubuntu-22.04, 2.13, temurin@21)
+  - status-success=Test (ubuntu-22.04, 3, temurin@11)
+  - status-success=Generate Site (ubuntu-22.04, temurin@11)
   actions:
     merge:
       method: squash