From 338203f80cd586092f92b27ce35ed19d7192b0ea Mon Sep 17 00:00:00 2001
From: Tobias Berger <toby@tobot.dev>
Date: Tue, 18 Nov 2025 22:31:48 +0100
Subject: [PATCH] Maps changelog in Discord

---
 .github/workflows/changelog.yml            | 56 ----------------------
 .github/workflows/publish.yml              |  9 ++++
 Tools/actions_changelogs_since_last_run.py |  2 +-
 3 files changed, 10 insertions(+), 57 deletions(-)
 delete mode 100644 .github/workflows/changelog.yml

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
deleted file mode 100644
index 4e39a8836b4..00000000000
--- a/.github/workflows/changelog.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: PR Changelogs
-concurrency: commit_action
-on:
-  pull_request_target:
-    types: [closed]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.BOT_TOKEN }}
-  CHANGELOG_DIR: ${{ vars.CHANGELOG_DIR }}
-  PR_NUMBER: ${{ github.event.number }}
-
-jobs:
-  changelog:
-    runs-on: self-hosted
-    if: github.event.pull_request.merged == true
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout Master
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.BOT_TOKEN }}
-          ref: "${{ vars.CHANGELOG_BRANCH }}"
-
-      - name: Setup Git
-        run: |
-          git config --global user.name "${{ vars.CHANGELOG_USER }}"
-          git config --global user.email "${{ vars.CHANGELOG_EMAIL }}"
-        shell: bash
-
-      - name: Setup Node
-        uses: actions/setup-node@v4
-        with:
-          node-version: 22.x
-
-      - name: Install Dependencies
-        run: |
-          cd "Tools/changelog"
-          npm install
-        shell: bash
-        continue-on-error: true
-
-      - name: Generate Changelog
-        run: |
-          cd "Tools/changelog"
-          node changelog.js
-        shell: bash
-        continue-on-error: true
-
-      - name: Commit Changelog
-        run: |
-          git add *.yml
-          git commit -m "${{ vars.CHANGELOG_MESSAGE }} (#${{ env.PR_NUMBER }})"
-          git push
-        shell: bash
-        continue-on-error: true
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 201e3d24f0e..8d3a78cd446 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -54,6 +54,15 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+        CHANGELOG_FILE: "Resources/Changelog/DeltaVChangelog.yml"
+
+    - name: Publish maps changelog (Discord)
+      continue-on-error: true
+      run: Tools/actions_changelogs_since_last_run.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }}
+        CHANGELOG_FILE: "Resources/Changelog/Maps.yml"
 
     - name: Publish changelog (RSS)
       continue-on-error: true
diff --git a/Tools/actions_changelogs_since_last_run.py b/Tools/actions_changelogs_since_last_run.py
index cc521c5727a..82bccff0238 100755
--- a/Tools/actions_changelogs_since_last_run.py
+++ b/Tools/actions_changelogs_since_last_run.py
@@ -23,7 +23,7 @@ GITHUB_API_URL = os.environ.get("GITHUB_API_URL", "https://api.github.com")
 DISCORD_SPLIT_LIMIT = 2000
 DISCORD_WEBHOOK_URL = os.environ.get("DISCORD_WEBHOOK_URL")
 
-CHANGELOG_FILE = "Resources/Changelog/DeltaVChangelog.yml"
+CHANGELOG_FILE = os.environ.get("CHANGELOG_FILE")
 
 TYPES_TO_EMOJI = {"Fix": "🐛", "Add": "🆕", "Remove": "❌", "Tweak": "⚒️"}