Skip to content

Commit 3deef97

Browse files
authored
Merge pull request #1066 from Spartan322/4.3-fix/changelog-builder
[4.3] Fix changelog builder tag resolver and title transformers
2 parents 5e92a66 + 932546e commit 3deef97

1 file changed

Lines changed: 41 additions & 10 deletions

File tree

.github/workflows/changelog_builder.yml

Lines changed: 41 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@ name: 📜 Changelog Builder
22
on:
33
push:
44
tags:
5-
- redot-*
5+
- redot-4.3*
66

77
permissions:
88
contents: write
99

10-
env:
11-
STABLE_SINCE_REDOT_VERSION: 4.4
12-
1310
jobs:
1411
prepare-release:
1512
name: Prepare Release
@@ -25,6 +22,18 @@ jobs:
2522
configurationJson: |
2623
{
2724
"base_branches": ["4.3"],
25+
"tag_resolver": {
26+
"method": "sort",
27+
"filter": {
28+
"method": "regexr",
29+
"pattern": "redot-(4\\.3(?:\\.\\d+)?)-(?:(alpha|beta|rc)\\.(\\d+)|(stable))"
30+
},
31+
"transformer": {
32+
"method": "regexr",
33+
"pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?-(?:(alpha|beta|rc)\\.(\\d+)|(stable)))",
34+
"target": "$1"
35+
}
36+
},
2837
"custom_placeholders": [
2938
{
3039
"name": "RELEASE_VERSION",
@@ -39,8 +48,9 @@ jobs:
3948
"name": "SIMPLIFIED_TITLE",
4049
"source": "TITLE",
4150
"transformer": {
42-
"pattern": "^(\\[\\d+\\.\\d+\\] )",
43-
"target": ""
51+
"method": "regexr",
52+
"pattern": "^(\\[\\d+\\.\\d+\\] )?(.*)",
53+
"target": "$2"
4454
}
4555
}
4656
],
@@ -102,10 +112,21 @@ jobs:
102112
env:
103113
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104114
with:
105-
fromTag: redot-${{env.STABLE_SINCE_REDOT_VERSION}}-stable
106115
configurationJson: |
107116
{
108117
"base_branches": ["4.3"],
118+
"tag_resolver": {
119+
"method": "sort",
120+
"filter": {
121+
"method": "regexr",
122+
"pattern": "redot-(4\\.3(?:\\.\\d+)?)-(stable)"
123+
},
124+
"transformer": {
125+
"method": "regexr",
126+
"pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?-stable)",
127+
"target": "$1"
128+
}
129+
},
109130
"custom_placeholders": [
110131
{
111132
"name": "RELEASE_VERSION",
@@ -116,12 +137,22 @@ jobs:
116137
"target": "$1 $2$4 $3"
117138
}
118139
},
140+
{
141+
"name": "SINCE_VERSION",
142+
"source": "FROM_TAG",
143+
"transformer": {
144+
"method": "regexr",
145+
"pattern": "redot-(\\d+\\.\\d+(?:\\.\\d+)?)-(?:(alpha|beta|rc)\\.(\\d+)|(stable))",
146+
"target": "$1"
147+
}
148+
},
119149
{
120150
"name": "SIMPLIFIED_TITLE",
121151
"source": "TITLE",
122152
"transformer": {
123-
"pattern": "^(\\[\\d+\\.\\d+\\] )",
124-
"target": ""
153+
"method": "regexr",
154+
"pattern": "^(\\[\\d+\\.\\d+\\] )?(.*)",
155+
"target": "$2"
125156
}
126157
}
127158
],
@@ -170,7 +201,7 @@ jobs:
170201
"consume": true
171202
}
172203
],
173-
"template": "## Since Redot ${{env.STABLE_SINCE_REDOT_VERSION}}\n\n#{{CHANGELOG}}\n**Full Changelog**: #{{RELEASE_DIFF}}",
204+
"template": "## Since Redot #{{SINCE_VERSION}}\n\n#{{CHANGELOG}}\n**Full Changelog**: #{{RELEASE_DIFF}}",
174205
"pr_template": "* #{{SIMPLIFIED_TITLE}} by #{{AUTHOR}} in #{{URL}}",
175206
"max_pull_requests": 1000,
176207
"max_back_track_time_days": 365

0 commit comments

Comments
 (0)