fix(generation): ensure skip_tags condition is evaluated first (#1190)

* fix: ensure all skip_tags conditions are evaluated first

Signed-off-by: Shingo OKAWA <shingo.okawa.g.h.c@gmail.com>

* ci: trigger GitHub Actions

Signed-off-by: Shingo OKAWA <shingo.okawa.g.h.c@gmail.com>

* chore(test): update changelog::test::changelog_generator_render_always regarding rebase

Signed-off-by: Shingo OKAWA <shingo.okawa.g.h.c@gmail.com>

---------

Signed-off-by: Shingo OKAWA <shingo.okawa.g.h.c@gmail.com>

Author: ognis1205

.github/fixtures/test-skip-tags/cliff.toml

@@ -0,0 +1,25 @@
+# git-cliff ~ configuration file
+# https://git-cliff.org/docs/configuration
+
+[changelog]
+# A Tera template to be rendered for each release in the changelog.
+# See https://keats.github.io/tera/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+
+[git]
+# Regex to select git tags that do not represent proper releases.
+# Takes precedence over `tag_pattern`.
+# Changes belonging to these releases will be included in the next release.
+skip_tags = "v0.0.1"

.github/fixtures/test-skip-tags/commit.sh

@@ -0,0 +1,8 @@
+set -e
+
+GIT_COMMITTER_DATE="2025-06-24 21:01:21" git commit --allow-empty -m "init"
+git tag v0.0.1
+
+GIT_COMMITTER_DATE="2025-06-24 21:01:22" git commit --allow-empty -m "feat: add feature 0"
+GIT_COMMITTER_DATE="2025-06-24 21:01:23" git commit --allow-empty -m "feat: add feature 1"
+git tag v0.1.0

.github/fixtures/test-skip-tags/expected.md

@@ -0,0 +1,7 @@
+## [0.1.0] - 2025-06-24
+
+### <!-- 0 -->🚀 Features
+
+- Add feature 0
+- Add feature 1
+

git-cliff-core/src/changelog.rs

@@ -195,28 +195,25 @@ impl<'a> Changelog<'a> {
 			.into_iter()
 			.rev()
 			.filter(|release| {
+				if let Some(version) = &release.version {
+					if skip_regex.is_some_and(|r| r.is_match(version)) {
+						skipped_tags.push(version.clone());
+						trace!("Skipping release: {}", version);
+						return false;
+					}
+				}
 				if release.commits.is_empty() {
 					if let Some(version) = release.version.clone() {
 						trace!("Release doesn't have any commits: {}", version);
 					}
 					match &release.previous {
 						Some(prev_release) if prev_release.commits.is_empty() => {
-							self.config.changelog.render_always
+							return self.config.changelog.render_always;
 						}
-						_ => false,
+						_ => return false,
 					}
-				} else if let Some(version) = &release.version {
-					!skip_regex.is_some_and(|r| {
-						let skip_tag = r.is_match(version);
-						if skip_tag {
-							skipped_tags.push(version.clone());
-							trace!("Skipping release: {}", version);
-						}
-						skip_tag
-					})
-				} else {
-					true
 				}
+				true
 			})
 			.map(|release| release.with_statistics())
 			.collect();
@@ -1268,6 +1265,7 @@ mod test {
 	#[test]
 	fn changelog_generator() -> Result<()> {
 		let (config, releases) = get_test_data();
+
 		let mut changelog = Changelog::new(releases, &config, None)?;
 		changelog.bump_version()?;
 		changelog.releases[0].timestamp = Some(0);
@@ -1358,6 +1356,41 @@ mod test {
 			.replace("			", ""),
 			str::from_utf8(&out).unwrap_or_default()
 		);
+
+		Ok(())
+	}
+
+	#[test]
+	fn changelog_generator_render_always() -> Result<()> {
+		let (mut config, mut releases) = get_test_data();
+		config.changelog.render_always = true;
+
+		releases[0].commits = Vec::new();
+		releases[2].commits = Vec::new();
+		releases[2].previous = Some(Box::new(releases[0].clone()));
+		let changelog = Changelog::new(releases, &config, None)?;
+		let mut out = Vec::new();
+		changelog.generate(&mut out)?;
+		assert_eq!(
+			String::from(
+				r#"# Changelog
+
+			## Unreleased
+
+			### Commit Statistics
+
+			- 0 commit(s) contributed to the release.
+			- 0 day(s) passed between the first and last commit.
+			- 0 commit(s) parsed as conventional.
+			- 0 linked issue(s) detected in commits.
+			- -578 day(s) passed between releases.
+			-- total releases: 1 --
+			"#
+			)
+			.replace("			", ""),
+			str::from_utf8(&out).unwrap_or_default()
+		);
+
 		Ok(())
 	}
 
@@ -1367,7 +1400,6 @@ mod test {
 		config.git.split_commits = true;
 		config.git.filter_unconventional = false;
 		config.git.protect_breaking_commits = true;
-
 		for parser in config
 			.git
 			.commit_parsers
@@ -1522,6 +1554,7 @@ chore(deps): fix broken deps
 			.replace("			", ""),
 			str::from_utf8(&out).unwrap_or_default()
 		);
+
 		Ok(())
 	}