From 163b0aa4f4f77142af178d045e9aef88d9440e90 Mon Sep 17 00:00:00 2001
From: jason yang <jasonyangshadow@gmail.com>
Date: Thu, 7 Dec 2023 11:53:24 +0000
Subject: [PATCH] add git tag to nightly release

Signed-off-by: jason yang <jasonyangshadow@gmail.com>
---
 .github/actions/generate/action.yml |  4 +++-
 .github/actions/rpm/action.yml      | 25 +------------------------
 .github/workflows/nightly.yml       |  3 +--
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.github/actions/generate/action.yml b/.github/actions/generate/action.yml
index c1227fb8..5f25455e 100644
--- a/.github/actions/generate/action.yml
+++ b/.github/actions/generate/action.yml
@@ -106,8 +106,10 @@ runs:
         
         This release contains latest commits, which is a feature unstable version
 
+        Reflog:
         ${{ steps.commits.outputs.raw }}
 
+        Commits:
         ${{ steps.commits.outputs.commits }}
         EOF
       shell: bash
@@ -119,12 +121,12 @@ runs:
         GITHUB_TOKEN: ${{ inputs.token }}
       with:
         release_id: ${{ inputs.event-id }}
+        delete_file: "warewulf-*.tar.gz;warewulf-*.rpm"
         file: ${{ env.DIST }}
         tag_name: "nightly"
         prerelease: true
         draft: false
         default_release_name: "warewulf nightly release"
-        overwrite: true
 
     - name: Update nightly release content
       if: inputs.nightly == 'true' && steps.should-continue.outputs.continue == 'true'
diff --git a/.github/actions/rpm/action.yml b/.github/actions/rpm/action.yml
index dbe310ae..13310eb1 100644
--- a/.github/actions/rpm/action.yml
+++ b/.github/actions/rpm/action.yml
@@ -20,9 +20,6 @@ inputs:
   event-id:
     description: "Github event id"
     required: true
-  nightly:
-    description: "Whether it is nightly release"
-    default: 'false'
 
 runs:
   using: "composite"
@@ -68,25 +65,6 @@ runs:
         mock -r ${{ inputs.target }} --chroot -- make -C /builddir/build/BUILD/warewulf-${{ env.EXPECTED_VERSION }} test
       shell: bash
 
-    # we need to rename the RPMs and SRPMs to overwrite for nightly release
-    - name: Rename the built RPMs for nightly build
-      if: inputs.nightly == 'true'
-      run: |
-        VERSION=$(rpm -q --qf "%{VERSION}\n" --specfile warewulf.spec)
-        GENERIC_RELEASE=$(rpm -q --qf "%{RELEASE}\n" --specfile warewulf.spec | cut -d. -f1-2)
-        RPM=warewulf-${VERSION}-${GENERIC_RELEASE}.${{ inputs.dist }}.${{ inputs.arch }}.rpm
-        SRPM=warewulf-${VERSION}-${GENERIC_RELEASE}.${{ inputs.dist }}.src.rpm
-
-        RNAME_RPM=warewulf-${VERSION}.${{ inputs.dist }}.${{ inputs.arch }}.rpm
-        RNAME_SRPM=warewulf-${VERSION}.${{ inputs.dist }}.src.rpm
-
-        mv /var/lib/mock/${{ inputs.target }}/result/${RPM} /var/lib/mock/${{ inputs.target }}/result/${RNAME_RPM}
-        mv /var/lib/mock/${{ inputs.target }}/result/${SRPM} /var/lib/mock/${{ inputs.target }}/result/${RNAME_SRPM}
-
-        echo "RPM=${RNAME_RPM}" >> $GITHUB_ENV
-        echo "SRPM=${RNAME_SRPM}" >> $GITHUB_ENV
-      shell: bash
-
     - name: Upload RPM
       uses: actions/upload-artifact@v3
       with:
@@ -105,5 +83,4 @@ runs:
         GITHUB_TOKEN: ${{ inputs.token }}
       with:
         release_id: ${{ inputs.event-id }}
-        file: "/var/lib/mock/${{ inputs.target }}/result/${{ env.RPM }};/var/lib/mock/${{ inputs.target }}/result/${{ env.SRPM }}"
-        overwrite: true
\ No newline at end of file
+        file: "/var/lib/mock/${{ inputs.target }}/result/${{ env.RPM }};/var/lib/mock/${{ inputs.target }}/result/${{ env.SRPM }}"
\ No newline at end of file
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2b11d059..418d67e0 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -68,5 +68,4 @@ jobs:
               target: ${{ matrix.target }}
               token: ${{ secrets.GITHUB_TOKEN }}
               version: ${{ needs.generate.outputs.version }}
-              event-id: ${{ needs.generate.outputs.release-id }}
-              nightly: 'true'
\ No newline at end of file
+              event-id: ${{ needs.generate.outputs.release-id }}
\ No newline at end of file