From: Matthew Newton <matthew-git@newtoncomputing.co.uk>
Date: Mon, 8 Jul 2024 15:30:05 +0000 (+0100)
Subject: Fixups for CentOS 7 which is now EOL
X-Git-Tag: release_3_0_27~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff8ef54953bd7a25838f03f3f2ed367da19e01bd;p=thirdparty%2Ffreeradius-server.git

Fixups for CentOS 7 which is now EOL
---

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 94faf33e42..42acb9f60c 100644
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -15,9 +15,9 @@ jobs:
     strategy:
       matrix:
         env:
-          - { NAME: "centos-7",  OS: "centos:7" }
-          - { NAME: "rocky-8",   OS: "rockylinux/rockylinux:8" }
-          - { NAME: "rocky-9",   OS: "rockylinux/rockylinux:9" }
+          - { NAME: "centos-7",  OS: "centos:7",                BADNODE: true  }
+          - { NAME: "rocky-8",   OS: "rockylinux/rockylinux:8", BADNODE: false }
+          - { NAME: "rocky-9",   OS: "rockylinux/rockylinux:9", BADNODE: false }
       fail-fast: false
 
     runs-on: ubuntu-latest
@@ -28,11 +28,18 @@ jobs:
     env:
       HOSTAPD_BUILD_DIR: /tmp/eapol_test.ci
       HOSTAPD_GIT_TAG: hostapd_2_8
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.env.BADNODE }}
 
     name: "RPM build"
 
     steps:
 
+    - name: Fix up CentOS 7 repositories
+      if: ${{ matrix.env.NAME == 'centos-7' }}
+      run: |
+        sed -i "s/^mirrorlist/#mirrorlist/g" /etc/yum.repos.d/CentOS-*
+        sed -i "s|#\s*baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-*
+
     # Required so that the checkout action uses git protocol rather than the GitHub REST API.
     # make rpm requires the FR directory to be a git repository.
     - name: Install recent git for CentOS 7
@@ -194,9 +201,9 @@ jobs:
     strategy:
       matrix:
         env:
-          - { NAME: "centos-7", OS: "centos:7" }
-          - { NAME: "rocky-8", OS: "rockylinux/rockylinux:8" }
-          - { NAME: "rocky-9", OS: "rockylinux/rockylinux:9" }
+          - { NAME: "centos-7",  OS: "centos:7",                BADNODE: true  }
+          - { NAME: "rocky-8",   OS: "rockylinux/rockylinux:8", BADNODE: false }
+          - { NAME: "rocky-9",   OS: "rockylinux/rockylinux:9", BADNODE: false }
       fail-fast: false
 
     runs-on: ubuntu-latest
@@ -204,10 +211,19 @@ jobs:
     container:
       image: ${{ matrix.env.OS }}
 
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: ${{ matrix.env.BADNODE }}
+
     name: "RPM install test"
 
     steps:
 
+    - name: Fix up CentOS 7 repositories
+      if: ${{ matrix.env.NAME == 'centos-7' }}
+      run: |
+        sed -i "s/^mirrorlist/#mirrorlist/g" /etc/yum.repos.d/CentOS-*
+        sed -i "s|#\s*baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-*
+
     - name: Install yum
       if: ${{ matrix.env.NAME == 'rocky-9'}}
       run: |