Build for AlmaLinux 8 (#11)

* Build and release for AlmaLinux 8 * Fix rpmlint call * Powertools repository is needed on REHL8, and crb is only for RHEL9 * htcondor repository is needed, wlcg-repo do not contain real packages for el9, and nothing for el8 * Bump to 6.1.0 --------- Co-authored-by: Andrea Manzi <[email protected]>
EGI-Federation · Jun 17, 2024 · 778680e · 778680e
1 parent 569cb2c
commit 778680e
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 9 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,10 +27,14 @@ jobs:
           path: |
             build/RPMS/x86_64/ui-*.el7.x86_64.rpm
 
-  build-almalinux9:
-    name: Build AlmaLinux 9 RPMs
+  # Use a matrix for AlmaLinux version
+  build-almalinux:
+    strategy:
+      matrix:
+        almalinux-version: [8, 9]
+    name: Build AlmaLinux ${{ matrix.almalinux-version }} RPMs
     runs-on: ubuntu-latest
-    container: almalinux:9
+    container: almalinux:${{ matrix.almalinux-version }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -41,13 +45,13 @@ jobs:
       - name: build rpm
         run: |
           make clean rpm
-          rpmlint --file .rpmlint.ini build/RPMS/noarch/*.rpm
+          rpmlint --file .rpmlint.ini build/RPMS/x86_64/*.rpm
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms9
+          name: rpms${{ matrix.almalinux-version }}
           path: |
-            build/RPMS/x86_64/ui-*.el9.x86_64.rpm
+            build/RPMS/x86_64/ui-*.el${{ matrix.almalinux-version }}.x86_64.rpm
 
   centos7-install:
     name: Install CentOS 7 RPMs
@@ -64,9 +68,28 @@ 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-almalinux8:
+    name: Install AlmaLinux 8 RPMs
+    needs: build-almalinux
+    runs-on: ubuntu-latest
+    container: almalinux:8
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          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: Remove htcondor and 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-almalinux9
+    needs: build-almalinux
     runs-on: ubuntu-latest
     container: almalinux:9
     steps:
@@ -77,7 +100,8 @@ jobs:
         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
+          # FIXME: Remove htcondor and replace WLCG repo by UMD5 once available
           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
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,6 +33,28 @@ jobs:
             build/RPMS/x86_64/ui-*.el7.x86_64.rpm
             build/SRPMS/ui-*.el7.src.rpm
 
+  almalinux8:
+    name: Build AlmaLinux 8 RPMs
+    runs-on: ubuntu-latest
+    container: almalinux:8
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install build requisites
+        run: |
+          dnf install -y rpm-build make rsync systemd-rpm-macros
+      - name: build rpm
+        run: |
+          make clean rpm
+      - name: Upload RPMs
+        uses: actions/upload-artifact@v4
+        with:
+          name: rpms8
+          path: |
+            build/RPMS/x86_64/ui-*.el8.x86_64.rpm
+            build/SRPMS/ui-*.el8.src.rpm
+
   almalinux9:
     name: Build AlmaLinux 9 RPMs
     runs-on: ubuntu-latest
@@ -82,6 +104,33 @@ jobs:
             ${{ steps.package_name_centos7.outputs.rpm_path }}
             ${{ steps.package_name_centos7.outputs.src_path }}
 
+  release8:
+    name: Upload AlmaLinux 8 release artefacts
+    permissions:
+      contents: write # to upload release asset (softprops/action-gh-release)
+    needs: almalinux8
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: rpms8
+      - name: Find package name
+        id: package_name_almalinux8
+        run: |
+          rpm_path=$(find . -name 'ui-*.el8.x86_64.rpm')
+          src_path=$(find . -name 'ui-*.el8.src.rpm')
+          echo "rpm_path=${rpm_path}" >> "$GITHUB_OUTPUT"
+          echo "src_path=${src_path}" >> "$GITHUB_OUTPUT"
+      - name: Attach AlmaLinux 8 RPMs to the release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          fail_on_unmatched_files: true
+          files: |
+            ${{ steps.package_name_almalinux8.outputs.rpm_path }}
+            ${{ steps.package_name_almalinux8.outputs.src_path }}
+
   release9:
     name: Upload AlmaLinux 9 release artefacts
     permissions:

diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,9 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [6.1.0]
+- Build and package for RHEL8 (#11) (Baptiste Grenier)
+
 ## [6.0.1]
 - Add ARC REST, ginfo and lcg-infosites on RHEL9 (#10) (Baptiste Grenier)
 

diff --git a/ui.spec b/ui.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name: ui
-Version: 6.0.1
+Version: 6.1.0
 Release: 1%{?dist}
 Summary: User Interface meta-package
 Group: Applications/Internet
@@ -81,6 +81,8 @@ rm -rf %{buildroot}
 %doc /usr/share/doc/ui/README.md
 
 %changelog
+* Tue Jun 11 2024 <[email protected]> - 6.1.0-1
+- Build and package for RHEL8 (#11) (Baptiste Grenier)
 * Mon Jun 10 2024 <[email protected]> - 6.0.1-1
 - Add ARC REST, ginfo and lcg-infosites on RHEL9 (#10) (Baptiste Grenier)
 * Tue Jun 04 2024 <[email protected]> - 6.0.0-1