From f8c662c71278ab90a6dc4eccbc2d8ce8753df42c Mon Sep 17 00:00:00 2001 From: Spartan322 Date: Wed, 6 Aug 2025 13:56:10 -0400 Subject: [PATCH] Fix changelog builder tag resolver and title transformers --- .github/workflows/changelog_builder.yml | 53 ++++++++++++++++++++----- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/.github/workflows/changelog_builder.yml b/.github/workflows/changelog_builder.yml index 53737ed28d..285e164907 100644 --- a/.github/workflows/changelog_builder.yml +++ b/.github/workflows/changelog_builder.yml @@ -3,13 +3,12 @@ on: push: tags: - redot-* + - '!redot-4.3*' + - '!redot-4.4*' permissions: contents: write -env: - STABLE_SINCE_REDOT_VERSION: 4.4 - jobs: prepare-release: name: Prepare Release @@ -25,6 +24,18 @@ jobs: configurationJson: | { "base_branches": ["master", "4.3", "4.4"], + "tag_resolver": { + "method": "sort", + "filter": { + "method": "regexr", + "pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?)-(?:(alpha|beta|rc)\\.(\\d+)|(stable))" + }, + "transformer": { + "method": "regexr", + "pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?-(?:(alpha|beta|rc)\\.(\\d+)|(stable)))", + "target": "$1" + } + }, "custom_placeholders": [ { "name": "RELEASE_VERSION", @@ -39,8 +50,9 @@ jobs: "name": "SIMPLIFIED_TITLE", "source": "TITLE", "transformer": { - "pattern": "^(\\[\\d+\\.\\d+\\] )", - "target": "" + "method": "regexr", + "pattern": "^(\\[\\d+\\.\\d+\\] )?(.*)", + "target": "$2" } } ], @@ -102,10 +114,21 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - fromTag: redot-${{env.STABLE_SINCE_REDOT_VERSION}}-stable configurationJson: | { - "base_branches": ["master"], + "base_branches": ["master", "4.3", "4.4"], + "tag_resolver": { + "method": "sort", + "filter": { + "method": "regexr", + "pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?)-(stable)" + }, + "transformer": { + "method": "regexr", + "pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?-stable)", + "target": "$1" + } + }, "custom_placeholders": [ { "name": "RELEASE_VERSION", @@ -116,12 +139,22 @@ jobs: "target": "$1 $2$4 $3" } }, + { + "name": "SINCE_VERSION", + "source": "FROM_TAG", + "transformer": { + "method": "regexr", + "pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?)-(?:(alpha|beta|rc)\\.(\\d+)|(stable))", + "target": "$1" + } + }, { "name": "SIMPLIFIED_TITLE", "source": "TITLE", "transformer": { - "pattern": "^(\\[\\d+\\.\\d+\\] )", - "target": "" + "method": "regexr", + "pattern": "^(\\[\\d+\\.\\d+\\] )?(.*)", + "target": "$2" } } ], @@ -170,7 +203,7 @@ jobs: "consume": true } ], - "template": "## Since Redot ${{env.STABLE_SINCE_REDOT_VERSION}}\n\n#{{CHANGELOG}}\n**Full Changelog**: #{{RELEASE_DIFF}}", + "template": "## Since Redot #{{SINCE_VERSION}}\n\n#{{CHANGELOG}}\n**Full Changelog**: #{{RELEASE_DIFF}}", "pr_template": "* #{{SIMPLIFIED_TITLE}} by #{{AUTHOR}} in #{{URL}}", "max_pull_requests": 1000, "max_back_track_time_days": 365