Merge pull request #213 from jovandeginste/ignore-changelog

Exclude some commits from the changelog
jovandeginste · Aug 2, 2024 · d96cd05 · d96cd05
2 parents 4d43733 + cb6f09e
commit d96cd05
Show file tree

Hide file tree

Showing 14 changed files with 561 additions and 637 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/cliff.toml b/cliff.toml
@@ -12,16 +12,38 @@
   body = """
 ## What's Changed
 
-{%- if version %} in {{ version }}{%- endif -%}
+{%- if version %} in {{ version }}{%- endif %}
+{#  #}
+
+{%- set_global commit_message = "" -%}
+{%- set_global commit_author = "" -%}
+{%- set_global outside_pr = true -%}
 {% for commit in commits %}
-  {% if commit.github.pr_title -%}
-    {%- set commit_message = commit.github.pr_title -%}
-  {%- else -%}
-    {%- set commit_message = commit.message -%}
+  {%- if commit.github.pr_labels is containing("skip-release-notes") -%}
+      {%- continue -%}
+  {%- endif -%}
+  {%- if commit.message | split(pat="\n") | first | trim == commit_message -%}
+    {%- if commit.github.username == commit_author -%}
+      {%- continue -%}
+    {%- elif commit.github.username == "" -%}
+      {%- continue -%}
+    {%- elif commit.github.username -%}
+    {% else %}
+      {%- continue -%}
+    {%- endif -%}
   {%- endif -%}
-  * {{ commit_message | split(pat="\n") | first | trim }}\
-    {% if commit.github.username %} by @{{ commit.github.username }}{%- endif -%}
-    {% if commit.github.pr_number %} in \
+  {%- if commit.message | trim | split(pat="\n") | last | trim == "changelog: ignore" -%}
+    {%- continue -%}
+  {%- endif -%}
+  {%- if commit.github.pr_title -%}
+    {%- set_global commit_message = commit.github.pr_title | split(pat="\n") | first | trim -%}
+    {%- set_global outside_pr = false -%}
+  {%- else -%}
+    {%- set_global commit_message = commit.message | split(pat="\n") | first | trim -%}
+  {%- endif %}
+  {% if outside_pr or commit.github.pr_title %}{% else %}  {% endif %}- {{ commit_message }}\
+    {% if commit.github.username %},{% set_global commit_author = commit.github.username %} by @{{ commit.github.username }}{%- endif -%}
+    {% if commit.github.pr_number %}, in \
       [#{{ commit.github.pr_number }}]({{ self::remote_url() }}/pull/{{ commit.github.pr_number }}) \
     {%- endif %}
 {%- endfor -%}
@@ -32,7 +54,7 @@
   ## New Contributors
 {%- endif %}\
 {% for contributor in github.contributors | filter(attribute="is_first_time", value=true) %}
-  * @{{ contributor.username }} made their first contribution
+  - @{{ contributor.username }} made their first contribution
     {%- if contributor.pr_number %} in \
       [#{{ contributor.pr_number }}]({{ self::remote_url() }}/pull/{{ contributor.pr_number }}) \
     {%- endif %}
@@ -86,8 +108,6 @@
   topo_order = false
   # sort the commits inside sections by oldest/newest order
   sort_commits = "newest"
-  # regex for parsing and grouping commits
-  commit_parsers = [{ footer = "^changelog: ?ignore", skip = true }]
 
 
 [remote.github]

diff --git a/docs/dashboard-responsive.png b/docs/dashboard-responsive.png
diff --git a/docs/dashboard.png b/docs/dashboard.png
diff --git a/docs/login.png b/docs/login.png
diff --git a/docs/responsive.png b/docs/responsive.png
diff --git a/docs/single_workout-dark.png b/docs/single_workout-dark.png
diff --git a/docs/single_workout-light.png b/docs/single_workout-light.png
diff --git a/docs/single_workout-responsive.png b/docs/single_workout-responsive.png
diff --git a/docs/single_workout-theme.jpg b/docs/single_workout-theme.jpg
diff --git a/docs/statistics-responsive.png b/docs/statistics-responsive.png
diff --git a/docs/statistics.png b/docs/statistics.png
diff --git a/docs/upload_workouts.png b/docs/upload_workouts.png
diff --git a/docs/workout_overview.png b/docs/workout_overview.png