From 2020ac533d28ec79f517231452097a1bb9c99407 Mon Sep 17 00:00:00 2001
From: Samir Kamal <1954121+skamril@users.noreply.github.com>
Date: Tue, 5 Mar 2024 15:43:52 +0100
Subject: [PATCH] qwf

---
 .github/workflows/release-changelog.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-changelog.yml b/.github/workflows/release-changelog.yml
index be55b45a04..8612f911ef 100644
--- a/.github/workflows/release-changelog.yml
+++ b/.github/workflows/release-changelog.yml
@@ -13,13 +13,14 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # Important pour s'assurer que tous les commits sont récupérés
+          ref: ${{ github.event.pull_request.base.sha }} # Checkout the merge base commit of the PR
 
       - name: Generate changelog
         id: generate_changelog
         run: |
-          # Utilisez git pour extraire les messages de commit entre cette branche et master
-          CHANGELOG=$(git log origin/master.. --oneline --no-merges)
+          npm install -g conventional-changelog-cli
+          conventional-changelog -p angular -i CHANGELOG.md -s -r 0
+          CHANGELOG=$(cat CHANGELOG.md)
           # Formatage pour Markdown (commentaire GitHub)
           CHANGELOG="${CHANGELOG//'%'/'%25'}"
           CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"