From 56343247a1bb36eb55ec3b92ae492c8f4651ebe8 Mon Sep 17 00:00:00 2001 From: Ludovic <54670129+lbr38@users.noreply.github.com> Date: Tue, 16 Jul 2024 09:03:43 +0200 Subject: [PATCH] Maintain compatibility with el7 --- .github/workflows/build-rpm.yml | 15 ++++++++------- .github/workflows/packaging/rpm/spec | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-rpm.yml b/.github/workflows/build-rpm.yml index 31475cc..6785f9a 100644 --- 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 \ No newline at end of file diff --git a/.github/workflows/packaging/rpm/spec b/.github/workflows/packaging/rpm/spec index 1098ea7..5c99644 100644 --- 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