fix(fixtures): evaluate the rc of git-cliff correctly (#1104)

Cyclonit · web-flow · commit fa54a6adbcb8 · 2025-03-22T22:59:38.000+03:00
diff --git a/.github/actions/run-fixtures-test/action.yml b/.github/actions/run-fixtures-test/action.yml
@@ -39,13 +39,14 @@ runs:
 
     - name: Generate a changelog
       working-directory: ${{ inputs.fixtures-dir }}
+      shell: bash
       run: |
-        git cliff --config cliff.toml ${{ inputs.command }} > output.md || true
+        set +e
+        git cliff --config cliff.toml ${{ inputs.command }} > output.md
         echo "$?" > output.rc
         if [ -f output.md ]; then
           cat output.md
         fi
-      shell: bash
 
     - name: Compare the output with the expected output
       working-directory: ${{ inputs.fixtures-dir }}
@@ -67,7 +68,7 @@ runs:
       shell: bash
       run: |
         if [ -f expected.rc ]; then
-          if ! diff --strip-trailing-cr output.rc expected.rc; then
+          if ! diff --strip-trailing-cr --ignore-all-space output.rc expected.rc; then
             echo "The return code does not match the expected return code."
             exit 1
           fi
diff --git a/.github/fixtures/test-require-conventional-skipped/cliff.toml b/.github/fixtures/test-require-conventional-skipped/cliff.toml
@@ -45,7 +45,8 @@ require_conventional = true
 # Assigns commits to groups.
 # Optionally sets the commit's scope and can decide to exclude commits from further processing.
 commit_parsers = [
-    { message = "^feat", group = "Features", default_scope = "app", skip = true },
+    { message = "^feat", group = "Features", default_scope = "app" },
+    { message = "^fix", group = "Bug Fixes", skip = true },
     { message = "Initial commit", skip = true },
 ]
 # Prevent commits that are breaking from being excluded by commit parsers.
diff --git a/.github/fixtures/test-require-conventional-skipped/commit.sh b/.github/fixtures/test-require-conventional-skipped/commit.sh
@@ -3,7 +3,7 @@ set -e
 
 GIT_COMMITTER_DATE="2022-04-06 01:25:08" git commit --allow-empty -m "Initial commit"
 GIT_COMMITTER_DATE="2022-04-06 01:25:09" git commit --allow-empty -m "feat: add feature 1"
-GIT_COMMITTER_DATE="2022-04-06 01:25:10" git commit --allow-empty -m "fix!: fix feature 1"
+GIT_COMMITTER_DATE="2022-04-06 01:25:10" git commit --allow-empty -m "fix: fix feature 1"
 GIT_COMMITTER_DATE="2022-04-06 01:25:11" git commit --allow-empty -m "feat(gui)!: add feature 2"
 GIT_COMMITTER_DATE="2022-04-06 01:25:12" git commit --allow-empty -m "fix(gui)!: fix feature 2"
 
diff --git a/.github/fixtures/test-require-conventional-skipped/expected.md b/.github/fixtures/test-require-conventional-skipped/expected.md
@@ -6,13 +6,16 @@ All notable changes to this project will be documented in this file.
 
 ### Bug Fixes
 
-#### Cli
+#### Gui
 
-- Fix feature 1
 - Fix feature 2
 
 ### Features
 
+#### App
+
+- Add feature 1
+
 #### Gui
 
 - Add feature 2
