From 3027f4b9cecab1f3f4e05eeefdcbd33593e54745 Mon Sep 17 00:00:00 2001
From: Chris Lovering <chris.lovering.95@gmail.com>
Date: Mon, 19 May 2025 21:16:33 +0100
Subject: Only test on ubuntu-latest

We previously used a matrixc to test cgroups v1 & v2. Now that ubuntu 20.04 is no longer supported by GitHub, we not longer have access to a runner with v1 cgroups.
---
 .github/workflows/test.yaml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 591ed51..270ab2b 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -11,11 +11,7 @@ on:
 jobs:
   test:
     name: Test with coverage
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-24.04]
-
+    runs-on: ubuntu-latest
     steps:
       - name: Download image artifact
         uses: actions/download-artifact@v4
@@ -40,7 +36,7 @@ jobs:
         run: |
           export IMAGE_SUFFIX='-venv:${{ inputs.version }}'
           docker compose run \
-            --rm -T -e COVERAGE_DATAFILE=.coverage.${{ matrix.os }} \
+            --rm -T -e COVERAGE_DATAFILE=.coverage \
             --entrypoint coverage \
             snekbox \
             run -m unittest
@@ -49,8 +45,8 @@ jobs:
       - name: Upload coverage data
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-${{ matrix.os }}
-          path: .coverage.*
+          name: coverage
+          path: .coverage
           retention-days: 1
           include-hidden-files: true
 
@@ -76,12 +72,9 @@ jobs:
       - name: Download coverage data
         uses: actions/download-artifact@v4
         with:
-          pattern: coverage-*
+          pattern: coverage
           merge-multiple: true
 
-      - name: Combine coverage data
-        run: coverage combine .coverage.*
-
       - name: Display coverage report
         run: coverage report -m
 
-- 
cgit v1.2.3