From: Nick Porter <nick@portercomputing.co.uk>
Date: Thu, 23 Jan 2025 10:17:23 +0000 (+0000)
Subject: Switch CI runners to Ubuntu 24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=080434b94efc0a3ac68b758695e5928de6927f06;p=thirdparty%2Ffreeradius-server.git

Switch CI runners to Ubuntu 24
---

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d2492fe2b8..4d0b0a43ad 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -52,10 +52,10 @@ jobs:
 # docker  - the docker image name, if containers are being used
 # name    - used in the job name only
 #
-          - runs_on: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'self-hosted' || 'ubuntu-20.04' }}"
-            docker: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'docker.internal.networkradius.com/self-hosted' || 'ubuntu:20.04' }}"
-            name: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'self' || 'gh' }}-ubuntu20"
-            code: "ubuntu2004"
+          - runs_on: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'self-hosted' || 'ubuntu-24.04' }}"
+            docker: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'docker.internal.networkradius.com/self-hosted' || 'ubuntu:24.04' }}"
+            name: "${{ needs.pre-ci.outputs.selfhosted == '1' && 'self' || 'gh' }}-ubuntu24"
+            code: "ubuntu2404"
 
         env:
           - { CC: gcc,   DO_BUILD: yes, LIBS_OPTIONAL: no,  LIBS_ALT: no,  REPRODUCIBLE: no,  SANITIZER: no,  BUILD_CFLAGS: "-DWITH_EVAL_DEBUG",         NAME: linux-gcc-lean           }
@@ -163,15 +163,14 @@ jobs:
         libyubikey-dev \
         lintian \
         pbuilder \
-        python2-dev \
         python3-dev \
         ruby-dev \
         snmp \
         software-properties-common \
         quilt
 
-    - name: Install LLVM 15 for 20.04
-      if: ${{ matrix.os.code == 'ubuntu2004' && matrix.env.CC == 'clang' }}
+    - name: Install LLVM 15 for 24.04
+      if: ${{ matrix.os.code == 'ubuntu2404' && matrix.env.CC == 'clang' }}
       run: |
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add
         sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"