chore: fix github release

ImLunaHey · Sep 21, 2023 · 83fb8bc · 83fb8bc
1 parent 6c3ab46
commit 83fb8bc
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -61,16 +61,7 @@ jobs:
       - name: Get previous tag
         id: previous_tag
         run: |
-          echo "previous_tag=$(git --no-pager tag --sort=creatordate --merged ${{ github.ref_name }} | tail -2 | head -1)" >> $GITHUB_OUTPUT
-
-      - name: Generate CHANGELOG for Github release
-        id: changelog
-        uses: requarks/changelog-action@v1
-        with:
-          token: ${{ github.token }}
-          fromTag: ${{ steps.previous_tag.outputs.previous_tag }}
-          toTag: ${{ github.ref_name }}
-          writeToFile: false
+          echo "previous_tag=$(git describe --tags --abbrev=0)" >> $GITHUB_OUTPUT
 
       - name: Bump package version
         run: npx standard-version
@@ -83,6 +74,15 @@ jobs:
       - name: Push changes
         run: git push --follow-tags origin main
 
+      - name: Generate CHANGELOG for Github release
+        id: changelog
+        uses: requarks/changelog-action@v1
+        with:
+          token: ${{ github.token }}
+          fromTag: ${{ steps.previous_tag.outputs.previous_tag }}
+          toTag: ${{ steps.current_tag.outputs.current_tag }}
+          writeToFile: false
+
       - name: Create package for Github release
         run: npm pack