From cf546d2cf1ded94ee852584b5ed63547b3f4e4e7 Mon Sep 17 00:00:00 2001
From: Duncan Macleod <macleoddm@cardiff.ac.uk>
Date: Thu, 5 Sep 2024 17:25:27 +0100
Subject: [PATCH] ci: update RHEL build/test from EL7 to EL8

---
 .github/workflows/packaging.yml | 48 +++++++--------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 09ecd27..5730def 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -230,7 +230,7 @@ jobs:
       fail-fast: false
       matrix:
         el:
-          - el7-testing
+          - el8-testing
     runs-on: ubuntu-latest
     container: igwn/base:${{ matrix.el }}
     env:
@@ -241,10 +241,6 @@ jobs:
         with:
           name: tarball
 
-      - name: Configure DNF
-        if: matrix.el == 'el7-testing'
-        run: ln -s /usr/bin/yum /usr/bin/dnf
-
       - name: Configure EPEL
         run: |
           dnf -y install epel-release
@@ -253,7 +249,7 @@ jobs:
       - name: Configure rpmbuild
         run: |
           dnf -y install \
-              python-srpm-macros \
+              "*-srpm-macros" \
               rpm-build \
           ;
 
@@ -274,7 +270,7 @@ jobs:
       fail-fast: false
       matrix:
         el:
-          - el7-testing
+          - el8-testing
     runs-on: ubuntu-latest
     container: igwn/base:${{ matrix.el }}
     env:
@@ -285,43 +281,24 @@ jobs:
         with:
           name: srpm-${{ matrix.el }}
 
-      - name: Configure DNF
-        if: matrix.el == 'el7-testing'
-        run: ln -s /usr/bin/yum /usr/bin/dnf
-
       - name: Configure EPEL
         run: |
           dnf -y install epel-release
-          dnf -y install epel-rpm-macros
 
-      - name: Enable PowerTools (EL8+)
-        if: matrix.el != 'el7-testing'
+      - name: Enable PowerTools (EL8)
+        if: matrix.el == 'el8-testing'
         run: |
           dnf -y -q install "dnf-command(config-manager)"
           dnf config-manager --set-enabled powertools
 
-      - name: Install build tools (EL7)
-        if: matrix.el == 'el7-testing'
-        run: |
-          dnf -y -q install \
-              rpm-build \
-              yum-utils \
-          ;
-
-      - name: Install build tools (EL8+)
-        if: matrix.el != 'el7-testing'
+      - name: Install build tools
         run: |
           dnf -y -q install \
               rpm-build \
               "dnf-command(builddep)" \
           ;
 
-      - name: Install build dependencies (EL7)
-        if: matrix.el == 'el7-testing'
-        run: yum-builddep -y ${SRPM}
-
-      - name: Install build dependencies (EL8+)
-        if: matrix.el != 'el7-testing'
+      - name: Install build dependencies
         run: dnf builddep -y ${SRPM}
 
       - name: Build binary packages
@@ -358,7 +335,7 @@ jobs:
       fail-fast: false
       matrix:
         el:
-          - el7-testing
+          - el8-testing
     runs-on: ubuntu-latest
     container: igwn/base:${{ matrix.el }}
     steps:
@@ -367,14 +344,9 @@ jobs:
         with:
           name: rpm-${{ matrix.el }}
 
-      - name: Configure DNF
-        if: matrix.el == 'el7-testing'
-        run: ln -s /usr/bin/yum /usr/bin/dnf
-
       - name: Configure EPEL
         run: |
           dnf -y install epel-release
-          dnf -y install epel-rpm-macros
 
       - name: Install RPMs
         run: dnf -y install *.rpm
@@ -389,11 +361,11 @@ jobs:
       - name: Download RPM
         uses: actions/download-artifact@v4
         with:
-          name: rpm-el7-testing
+          name: rpm-el8-testing
 
       - name: Install rpmlint
         run: |
-          yum -y -q install \
+          dnf -y -q install \
               rpmlint \
           ;