From 8aa3383ec053ebe145659f2a28bfa5c946e5397a Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Thu, 17 Aug 2023 00:19:00 +0200
Subject: [PATCH 1/2] Prevent multiple changelog commits at once

If several try running at once, it'll fail for every action started while another one was running.
---
 .github/workflows/changelog.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 4aa59b5f6de..af5a94562b0 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -1,4 +1,5 @@
 name: PR Changelogs
+concurrency: commit_action
 on:
   pull_request_target:
     types: [closed]

From de42f1f814827d90b54f7ed20095a060538f232f Mon Sep 17 00:00:00 2001
From: Debug <49997488+DebugOk@users.noreply.github.com>
Date: Thu, 17 Aug 2023 00:41:46 +0200
Subject: [PATCH 2/2] Also pull master before pushing the new changelog

Just makes it that much more robust
---
 .github/workflows/changelog.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index af5a94562b0..ef963500c98 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -47,6 +47,7 @@ jobs:
 
       - name: Commit Changelog
         run: |
+          git pull origin master
           git add *.yml
           git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
           git push