sync CI rpm/deb with 3.2

diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml
index 46caccabae4cd0d5605d7c4079a7b1c904abf33a..e43b2e96adc7a0f4a5e508f03aea176bf1df5144 100644 (file)
--- a/.github/workflows/ci-deb.yml
+++ b/.github/workflows/ci-deb.yml
@@ -18,6 +18,7 @@ jobs:
         env:
           - { NAME: "ubuntu-20.04", OS: "ubuntu:20.04" }
           - { NAME: "ubuntu-22.04", OS: "ubuntu:22.04" }
+          - { NAME: "ubuntu-24.04", OS: "ubuntu:24.04" }
           - { NAME: "debian-10",    OS: "debian:buster" }
           - { NAME: "debian-11",    OS: "debian:bullseye" }
           - { NAME: "debian-12",    OS: "debian:bookworm" }
@@ -94,7 +95,7 @@ jobs:
         key: hostapd-${{ matrix.env.NAME }}-${{ env.HOSTAPD_GIT_TAG }}-v1
 
     # Debian sid defaults to gcc12 which fails to build eapol_test
-    - name: Install GCC 10 for eapol_test build
+    - name: Install GCC 11 for eapol_test build
       run: |
         apt-get install -y --no-install-recommends gcc-11
         update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 && update-alternatives --set gcc /usr/bin/gcc-11
@@ -140,6 +141,7 @@ jobs:
         env:
           - { NAME: "ubuntu-20.04", OS: "ubuntu:20.04" }
           - { NAME: "ubuntu-22.04", OS: "ubuntu:22.04" }
+          - { NAME: "ubuntu-24.04", OS: "ubuntu:24.04" }
           - { NAME: "debian-10", OS: "debian:buster" }
           - { NAME: "debian-11", OS: "debian:bullseye" }
           - { NAME: "debian-12", OS: "debian:bookworm" }
@@ -182,7 +184,7 @@ jobs:
 
     - name: Config test
       run: |
-        freeradius -XC
+        freeradius -XxC
 
     #
     #  We now perform some post-install tests that depend on the availability

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 6d555ed00e24f1b1552fb04009ef423c71c050bf..967da89152f45919680765cc99776fb2298cbf95 100644 (file)
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -37,7 +37,7 @@ jobs:
       run: |
         dnf install -y git-core
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: freeradius
 
@@ -134,7 +134,7 @@ jobs:
         mv freeradius/rpmbuild/RPMS/x86_64/*.rpm rpms/
 
     - name: Restore eapol_test build directory from cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       id: hostapd-cache
       with:
         path: ${{ env.HOSTAPD_BUILD_DIR }}
@@ -149,7 +149,7 @@ jobs:
       working-directory: freeradius
 
     - name: Store RPMs
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: rpms-${{ matrix.env.NAME }}
         path: rpms
@@ -229,7 +229,7 @@ jobs:
         dnf install -y procps-ng
 
     - name: Load RPMs
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: rpms-${{ matrix.env.NAME }}
 
@@ -239,7 +239,7 @@ jobs:
 
     - name: Config check
       run: |
-        radiusd -XC
+        radiusd -XxC
 
     #
     #  We now perform some post-install tests that depend on the availability
@@ -251,7 +251,7 @@ jobs:
         mv eapol_test /usr/local/bin
         chmod +x /usr/local/bin/eapol_test
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: freeradius
 
@@ -264,7 +264,7 @@ jobs:
 
     - name: Upload radius logs on failure
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: radius-logs-${{ matrix.env.NAME }}.tgz
         path: |