From 934646bfa7b9cdf9f8d7d37ab0dd2892cd510641 Mon Sep 17 00:00:00 2001
From: "phnx47[bot]" <78849906+phnx47-bot@users.noreply.github.com>
Date: Sat, 15 Jun 2024 10:15:54 +0000
Subject: [PATCH] chore: synced file(s) with prom-client-net/prom-client-tmpl

---
 .github/settings.yml            |  2 +-
 .github/workflows/automerge.yml |  2 +-
 .github/workflows/ci.yml        | 35 ++++++++++++++++++++++++++-------
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/.github/settings.yml b/.github/settings.yml
index df66fd0..6375803 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -68,7 +68,7 @@ branches:
       required_pull_request_reviews: null
       required_status_checks:
         strict: false
-        contexts: ['Build & Test']
+        contexts: ['Build & Test (Windows)', 'Build, Test & Pack (Linux)']
       enforce_admins: false
       required_linear_history: false
       restrictions: null
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 420f833..0b4ab08 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -13,7 +13,7 @@ permissions:
 jobs:
   automerge:
     name: Enable auto-merge
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: github.actor == 'phnx47-bot' && contains(github.event.pull_request.labels.*.name, 'sync')
     steps:
       - name: Checkout
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c331d03..31c3ac7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,9 +12,30 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    name: Build & Test
-    runs-on: ubuntu-22.04
+  build-windows:
+    name: Build & Test (Windows)
+    runs-on: windows-2022
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            2.1.x
+            3.1.x
+            5.0.x
+            6.0.x
+            7.0.x
+            8.0.x
+
+      - name: Run tests
+        run: dotnet test -c Release -p:CollectCoverage=false
+
+  build-linux:
+    name: Build, Test & Pack (Linux)
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -73,9 +94,9 @@ jobs:
 
   github:
     name: Deploy to GitHub
-    needs: [build]
+    needs: [build-windows, build-linux]
     if: github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -86,9 +107,9 @@ jobs:
 
   nuget:
     name: Deploy to NuGet
-    needs: [build]
+    needs: [build-windows, build-linux]
     if: startsWith(github.ref, 'refs/tags/v')
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Download artifacts
         uses: actions/download-artifact@v4