fix the cz

#12
nofusscomputing · Aug 8, 2024 · f2cc00d · f2cc00d
1 parent 04d2629
commit f2cc00d
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/.github/workflows/bump.yaml b/.github/workflows/bump.yaml
@@ -80,7 +80,7 @@ jobs:
 
 
 
-      - name: Install Commitizen
+      - name: Incremennt version with .cz.yaml
         shell: bash
         run: |
           cz bump \
@@ -89,17 +89,28 @@ jobs:
 
 
 
-      - name: Install Commitizen
+      # - name: Create Release Changelog
+      #   shell: bash
+      #   run: |
+      #     cz changelog  --incremental --dry-run --unreleased-version 
+
+
+
+      - name: Update Changelog - (Other Branches)
+        if: ${{ github.ref_name != 'master' }}
         shell: bash
         run: |
-          cz changelog  --incremental --dry-run --unreleased-version "${{ steps.get_next_version.outputs.nextStrict }}" > changelog-release.md
+          cz changelog --incremental --unreleased-version "${{ steps.get_next_version.outputs.nextStrict }}"
+          cz changelog --merge-prerelease --dry-run --incremental --unreleased-version "${{ steps.get_next_version.outputs.nextStrict }}" > changelog-release.md
 
 
 
-      # - name: Install Commitizen
-      #   shell: bash
-      #   run: |
-
+      - name: Update Changelog - (Master Branch)
+        if: ${{ github.ref_name == 'master' }}
+        shell: bash
+        run: |
+          cz changelog --merge-prerelease --unreleased-version ${{ steps.get_next_version.outputs.nextStrict }}"
+          cz changelog --merge-prerelease --dry-run --unreleased-version "${{ steps.get_next_version.outputs.nextStrict }}" > changelog-release.md