Merge pull request warewulf#1258 from JasonYangShadow/hotfix_nightly_…

…build fix nightly build invalid format issue
rthomson · Jun 12, 2024 · 1f274c0 · 1f274c0
2 parents ab5707c + 6abaa4d
commit 1f274c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/actions/rpm/action.yml b/.github/actions/rpm/action.yml
@@ -51,8 +51,8 @@ runs:
 
     - name: Set RPM and SRPM
       run: |
-        VERSION=$(rpm -q --qf "%{VERSION}\n" --specfile warewulf.spec)
-        GENERIC_RELEASE=$(rpm -q --qf "%{RELEASE}\n" --specfile warewulf.spec | cut -d. -f1)
+        VERSION=$(rpm -q --qf "%{VERSION}\n" --specfile warewulf.spec | head -1)
+        GENERIC_RELEASE=$(rpm -q --qf "%{RELEASE}\n" --specfile warewulf.spec | cut -d. -f1 | head -1)
         RPM=warewulf-${VERSION}-${GENERIC_RELEASE}.${{ inputs.dist }}.${{ inputs.arch }}.rpm
         SRPM=warewulf-${VERSION}-${GENERIC_RELEASE}.${{ inputs.dist }}.src.rpm
         DRACUT=wareful-dracut-${VERSION}-${GENERIC_RELEASE}.${{ inputs.dist }}.noarch.rpm

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,6 +37,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   `/sys/firmware/devicetree/base/serial-number`
 - Replace slice in templates with sprig substr. #1093
 
+## v4.5.x, unreleased
+
+### Fixed
+
+- Fix nightly build invalid format issue.
+
 ## v4.5.3, 2024-06-07
 
 ### Added