Maintain compatibility with el7

lbr38 · Jul 16, 2024 · 5634324 · 5634324
1 parent 17118bd
commit 5634324
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml
@@ -56,28 +56,29 @@ jobs:
         run: |
           cp ${GITHUB_WORKSPACE}/.github/workflows/packaging/rpm/spec $HOME/rpmbuild/SPECS/linupdate.spec
           sed -i "s/__VERSION__/${{ env.VERSION }}/g" $HOME/rpmbuild/SPECS/linupdate.spec
+          sed -i "s/__RELEASEVER__/el9/g" $HOME/rpmbuild/SPECS/linupdate.spec
 
       - name: Build package
         run: |
           cd $HOME/rpmbuild/SPECS
           rpmbuild --target noarch -bb --quiet linupdate.spec
-          mv $HOME/rpmbuild/RPMS/noarch/linupdate-${{ env.VERSION }}-stable.noarch.rpm /tmp/linupdate-test-build-${{ env.VERSION }}.noarch.rpm
+          mv $HOME/rpmbuild/RPMS/noarch/linupdate-${{ env.VERSION }}-el9.noarch.rpm /tmp/linupdate-test-build-${{ env.VERSION }}-el9.noarch.rpm
 
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: linupdate-test-build-${{ env.VERSION }}.noarch.rpm
-          path: /tmp/linupdate-test-build-${{ env.VERSION }}.noarch.rpm
+          name: linupdate-test-build-${{ env.VERSION }}-el9.noarch.rpm
+          path: /tmp/linupdate-test-build-${{ env.VERSION }}-el9.noarch.rpm
           retention-days: 1
 
-  # Try to install package on Fedora 37
+  # Try to install package on latest Fedora
   install-fedora:
     name: Install on Fedora 37
     needs:
       build-rpm
     runs-on: ubuntu-latest
     container:
-      image: fedora:37
+      image: fedora:latest
       options: --user root
     steps:
       - name: Checkout
@@ -90,11 +91,11 @@ jobs:
       - name: Download artifact
         uses: actions/download-artifact@v3
         with:
-          name: linupdate-test-build-${{ env.VERSION }}.noarch.rpm
+          name: linupdate-test-build-${{ env.VERSION }}-el9.noarch.rpm
 
       - name: Install package
         run: |
           dnf update -y
           yum clean all
-          yum --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}.noarch.rpm
+          yum --nogpgcheck localinstall -y ./linupdate-test-build-${{ env.VERSION }}-el9.noarch.rpm
   
diff --git a/.github/workflows/packaging/rpm/spec b/.github/workflows/packaging/rpm/spec
@@ -1,6 +1,6 @@
 Name:           linupdate
 Version:        __VERSION__
-Release:        stable
+Release:        __RELEASEVER__
 Summary:        Linupdate package updater - Repomanager client side agent
 
 BuildArch:      noarch