From 1517f92d14977c2d81355f8ef7047cf5275ef98c Mon Sep 17 00:00:00 2001
From: PhilNewm <Philippkd8@gmail.com>
Date: Fri, 25 Oct 2024 09:52:58 +0200
Subject: [PATCH] Include changelog handling

---
 .github/workflows/release_trigger.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release_trigger.yml b/.github/workflows/release_trigger.yml
index 996c019..3d97a04 100644
--- a/.github/workflows/release_trigger.yml
+++ b/.github/workflows/release_trigger.yml
@@ -28,6 +28,7 @@ env:
   ARTIFACT_NAME: "${{ vars.PROJECT_NAME }}-package"
   PROJECT_NAME: "${{ vars.PROJECT_NAME }}"
   REQUIRED_VARS: MAIN_BRANCH,MINOR_BUMP_LABEL,PATCH_BUMP_LABEL,PROJECT_NAME
+  CHANGELOG_ORDER: "${{ vars.CHANGELOG_ORDER || false }}"
 
 jobs:
   verify_repo_vars_and_secrets:
@@ -148,6 +149,7 @@ jobs:
           repo: "${{ github.repository }}"
           date: "${{ env.release_date }}"
           query_parameters: "body,labels,title"
+          changelog_labels: "${{ env.CHANGELOG_ORDER }}"
 
       - name: Show debug output
         run: |
@@ -373,7 +375,8 @@ jobs:
         with:
           commit: "${{ vars.MAIN_BRANCH }}"
           tag: "${{ env.NEXT_VERSION }}"
-          body: "${{ env.CHANGELOG }}"
+          body: "${{ env.CHANGELOG || false }}"
+          generateReleaseNotes: "${{ !env.CHANGELOG }}"
           artifacts: |
             ${{ needs.build-from-main.outputs.artifact_file }}
           token: ${{ env.GH_TOKEN }}