From 11380815e95f216ac21195efcbf2b21f0f9b40c6 Mon Sep 17 00:00:00 2001
From: Peter Feerick <pfeerick@users.noreply.github.com>
Date: Sun, 1 Feb 2026 09:06:33 +1000
Subject: [PATCH] ci: use hybrid changelog mode to support direct commits
 (#7057)

---
 .github/workflows/nightly.yml         | 2 ++
 .github/workflows/release-drafter.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index e6e6de93c..61aa324e2 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -101,6 +101,7 @@ jobs:
         id: build_changelog
         uses: mikepenz/release-changelog-builder-action@v4
         with:
+          mode: "HYBRID"
           configurationJson: |
             {
               "categories": [
@@ -159,6 +160,7 @@ jobs:
               ],
               "template": "#{{CHANGELOG}}",
               "pr_template": "- #{{TITLE}} (##{{NUMBER}})",
+              "commit_template": "- #{{TITLE}} (#{{MERGE_SHA}})",
               "empty_template": "- No changes",
               "label_extractor": [
                 {
diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 5b5b2dea3..d9692ef8e 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -190,6 +190,7 @@ jobs:
         id: build_changelog
         uses: mikepenz/release-changelog-builder-action@v4
         with:
+          mode: "HYBRID"
           configurationJson: |
             {
               "categories": [
@@ -248,6 +249,7 @@ jobs:
               ],
               "template": "#{{CHANGELOG}}\n\n## Thank you to the following contributors who made this release possible!\n#{{CONTRIBUTORS}}",
               "pr_template": "- #{{TITLE}} (##{{NUMBER}})",
+              "commit_template": "- #{{TITLE}} (#{{MERGE_SHA}})",
               "empty_template": "- No changes",
               "label_extractor": [
                 {