From d7473e352349263b23e65c6be879fb9460e92fbd Mon Sep 17 00:00:00 2001
From: Baptiste Grenier <baptiste.grenier@egi.eu>
Date: Tue, 11 Jun 2024 09:09:41 +0200
Subject: [PATCH] build: powertools is needed on REHL8, and cbr is only for
 RHEL9

---
 .github/workflows/build.yml | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dc4fe53..a38c99a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -68,24 +68,40 @@ jobs:
           yum install -y http://repository.egi.eu/sw/production/umd/4/centos7/x86_64/updates/umd-release-4.1.3-1.el7.centos.noarch.rpm
           yum localinstall -y ui-*.rpm
 
-  install-almalinux:
-    strategy:
-      matrix:
-        almalinux-version: [8, 9]
-    name: Install AlmaLinux ${{ matrix.almalinux-version }} RPMs
+  install-almalinux8:
+    name: Install AlmaLinux 8 RPMs
     needs: build-almalinux
     runs-on: ubuntu-latest
-    container: almalinux:${{ matrix.almalinux-version }}
+    container: almalinux:8
     steps:
       - uses: actions/download-artifact@v3
         with:
-          name: rpms${{ matrix.almalinux-version }}
+          name: rpms8
+      - name: Install generated RPMs
+        run: |
+          dnf install -y epel-release
+          dnf config-manager --add-repo http://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo
+          # FIXME: Replace WLCG repo by UMD5 once available
+          dnf install -y https://linuxsoft.cern.ch/wlcg/el8/x86_64/wlcg-repo-1.0.0-1.el8.noarch.rpm
+          dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/htcondor-release-current.el8.noarch.rpm
+          dnf config-manager --set-enabled powertools
+          dnf localinstall -y ui-*.rpm
+
+  install-almalinux9:
+    name: Install AlmaLinux 9 RPMs
+    needs: build-almalinux
+    runs-on: ubuntu-latest
+    container: almalinux:9
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: rpms9
       - name: Install generated RPMs
         run: |
           dnf install -y epel-release
           dnf config-manager --add-repo http://repository.egi.eu/sw/production/cas/1/current/repo-files/egi-trustanchors.repo
           # FIXME: Replace WLCG repo by UMD5 once available
-          dnf install -y https://linuxsoft.cern.ch/wlcg/el${{ matrix.almalinux-version }}/x86_64/wlcg-repo-1.0.0-1.el${{ matrix.almalinux-version }}.noarch.rpm
-          dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/htcondor-release-current.el${{ matrix.almalinux-version }}.noarch.rpm
+          dnf install -y https://linuxsoft.cern.ch/wlcg/el9/x86_64/wlcg-repo-1.0.0-1.el9.noarch.rpm
+          dnf install -y https://research.cs.wisc.edu/htcondor/repo/23.x/htcondor-release-current.el9.noarch.rpm
           dnf config-manager --set-enabled crb
           dnf localinstall -y ui-*.rpm