From 4ff47a507312d9288e40a24f9740f7dcf941a52e Mon Sep 17 00:00:00 2001
From: andy5995 <arch_stanton5995@proton.me>
Date: Sun, 5 Jan 2025 23:24:25 -0600
Subject: [PATCH] CI: hardcode ubuntu versions, remove clang-13

---
 .github/workflows/c-cpp.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index d8c6c69..2ee3c7c 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -26,25 +26,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cc: [gcc-9, gcc-11, clang-13, clang-14]
-    runs-on: ubuntu-latest
+        os: [ubuntu-22.04, ubuntu-24.04]
+        cc: [gcc, clang]
+    runs-on: ${{ matrix.os }}
     env:
       CC: ${{ matrix.cc }}
     steps:
     - uses: actions/checkout@v4
 
-    - name: Fix kernel mmap rnd bits
-      # Asan in llvm 14 provided in ubuntu 22.04 is incompatible with
-      # high-entropy ASLR in much newer kernels that GitHub runners are
-      # using leading to random crashes: https://reviews.llvm.org/D148280
-      run: sudo sysctl vm.mmap_rnd_bits=28
-
     - name: Install dependencies
       run: |
         sudo apt update
         sudo apt remove -y firefox
         sudo apt upgrade -y
-        sudo apt install -y meson ninja-build $CC
+        sudo apt install -y meson ninja-build
 
     - name: Build
       run: |