Build and release on RHEL8 (#4)

* Build and release on RHEL8 * Prepare version 5.1.0
EGI-Federation · Jun 18, 2024 · adfe0e5 · adfe0e5
1 parent 339844e
commit adfe0e5
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,10 +27,13 @@ jobs:
           path: |
             build/RPMS/x86_64/wn-*.el7.x86_64.rpm
 
-  almalinux9:
-    name: Build AlmaLinux 9 RPMs
+  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:
@@ -45,9 +48,9 @@ jobs:
       - name: Upload RPMs
         uses: actions/upload-artifact@v3
         with:
-          name: rpms9
+          name: rpms${{ matrix.almalinux-version }}
           path: |
-            build/RPMS/x86_64/wn-*.el9.x86_64.rpm
+            build/RPMS/x86_64/wn-*.el${{ matrix.almalinux-version }}.x86_64.rpm
 
   centos7-install:
     name: Install CentOS 7 RPMs
@@ -64,9 +67,26 @@ 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 wn-*.rpm
 
-  almalinux9-install:
+  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: |
+          # FIXME: add UMD5 when available
+          dnf install -y epel-release
+          dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm
+          dnf config-manager --set-enabled powertools
+          dnf localinstall -y wn-*.rpm
+
+  install-almalinux9:
     name: Install AlmaLinux 9 RPMs
-    needs: almalinux9
+    needs: build-almalinux
     runs-on: ubuntu-latest
     container: almalinux:9
     steps:
@@ -77,4 +97,5 @@ jobs:
         run: |
           # FIXME: add UMD5 when available
           dnf install -y epel-release
+          dnf install -y https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest.noarch.rpm
           dnf localinstall -y wn-*.rpm
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,10 +33,13 @@ jobs:
             build/RPMS/x86_64/wn-*.el7.x86_64.rpm
             build/SRPMS/wn-*.el7.src.rpm
 
-  almalinux9:
-    name: Build AlmaLinux 9 RPMs
+  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:
@@ -50,10 +53,10 @@ jobs:
       - name: Upload RPMs
         uses: actions/upload-artifact@v4
         with:
-          name: rpms9
+          name: rpms${{ matrix.almalinux-version }}
           path: |
-            build/RPMS/x86_64/wn-*.el9.x86_64.rpm
-            build/SRPMS/wn-*.el9.src.rpm
+            build/RPMS/x86_64/wn-*.el${{ matrix.almalinux-version }}.x86_64.rpm
+            build/SRPMS/wn-*.el${{ matrix.almalinux-version }}.src.rpm
 
   release7:
     name: Upload CentOS 7 release artefacts
@@ -82,11 +85,38 @@ 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: build-almalinux
+    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 'wn-*.el8.x86_64.rpm')
+          src_path=$(find . -name 'wn-*.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:
       contents: write # to upload release asset (softprops/action-gh-release)
-    needs: almalinux9
+    needs: build-almalinux
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v4

diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,9 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [5.1.0]
+- Added support for RHEL8 (Baptiste Grenier) (#4)
+
 ## [5.0.0]
 - Added support for el9 (Andrea Manzi) (#2)
 - Drop support for RHEL6 (Baptiste Grenier) (#1)

diff --git a/wn.spec b/wn.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name: wn
-Version: 5.0.0
+Version: 5.1.0
 Release: 1%{?dist}
 Summary: Worker Node meta-package
 Group: Applications/Internet
@@ -11,6 +11,7 @@ Source: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-build
 
 Requires: c-ares
+Requires: cvmfs
 Requires: dcap
 Requires: dcap-devel
 Requires: dcap-libs
@@ -19,7 +20,6 @@ Requires: dcap-tunnel-krb
 Requires: dcap-tunnel-ssl
 Requires: dcap-tunnel-telnet
 %if 0%{?rhel} == 7
-Requires: cvmfs
 Requires: cleanup-grid-accounts
 Requires: dcache-srmclient
 Requires: dpm
@@ -55,7 +55,11 @@ Requires: globus-gass-copy-progs
 Requires: globus-proxy-utils
 Requires: gridsite-libs
 Requires: openldap-clients
+%if 0%{?rhel} == 7
 Requires: python-ldap
+%else
+Requires: python3-ldap
+%endif
 Requires: uberftp
 Requires: voms-clients-java
 Requires: voms-devel
@@ -82,6 +86,8 @@ rm -rf %{buildroot}
 %doc /usr/share/doc/wn/README.md
 
 %changelog
+* Tue Jun 11 2024 Baptiste Grenier <[email protected]> - 5.1.0-1
+- Add support for RHEL8 (Baptiste Grenier) (#4)
 * Tue Jun 04 2024 Andrea Manzi <[email protected]> - 5.0.0-1
 - Add support for EL9
 * Thu Jun 01 2017 Andrea Manzi <[email protected]> - 4.0.5-1