Skip to content

Commit 40e6503

Browse files
authored
ブランチ名に「#」が含まれる際はMermaidに含まないようにする (#1443)
* ブランチ名に「#」が含まれる際はMermaidに含まないようにする * replaceAllを使う * fix style * Mermaid以外ではエスケープしないブランチ名を使う * Mermaid以外ではエスケープしないブランチ名を使う * 余分な変更を戻す * 余分な変更を戻す
1 parent 838a92c commit 40e6503

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

scripts/action/create_pull_request.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
module.exports = async ({ github, context }) => {
22
const HEAD_REF = process.env.HEAD_REF
3+
const escapedHeadRef = HEAD_REF.replaceAll('#', '')
34
const PR_NUMBER = process.env.PR_NUMBER
45
const PR_TITLE_PREFIX = process.env.PR_TITLE_PREFIX
56
let head = process.env.BRANCH_NAME_PREFIX
@@ -8,43 +9,44 @@ module.exports = async ({ github, context }) => {
89
head += '-' + HEAD_REF
910
}
1011

12+
const escapedHead = head.replaceAll('#', '')
1113
const headWithRepo = process.env.ORG_NAME + ':' + head
1214
let title = PR_TITLE_PREFIX
1315
let body = process.env.PR_DESCRIPTION_PREFIX
1416

15-
body += `本PR ( \`${head}\` ) をマージすると差分が次のPRに反映されます。\n`
17+
body += `本PR ( \`${escapedHead}\` ) をマージすると差分が次のPRに反映されます。\n`
1618
body += '* '
1719

1820
if (PR_NUMBER !== '') {
1921
body += `#${PR_NUMBER} ( `
2022
}
2123

22-
body += `\`${HEAD_REF}\``
24+
body += `\`${escapedHeadRef}\``
2325

2426
if (PR_NUMBER !== '') {
2527
body += ' )'
2628
}
2729

2830
body += '\n'
2931
body += '```mermaid\n'
30-
body += `%%{init: {'gitGraph': {'mainBranchName': '${HEAD_REF}'}}}%%\n`
32+
body += `%%{init: {'gitGraph': {'mainBranchName': '${escapedHeadRef}'}}}%%\n`
3133
body += 'gitGraph\n'
3234

3335
for (let i = 0; i < 2; i++) {
3436
body += ' commit\n'
3537
}
3638

37-
body += ` branch ${head}\n`
38-
body += ` checkout ${head}\n`
39+
body += ` branch ${escapedHead}\n`
40+
body += ` checkout ${escapedHead}\n`
3941
let commit = PR_TITLE_PREFIX
4042

4143
if (commit.length > 6) {
4244
commit = commit.substring(0, 6) + '......'
4345
}
4446

4547
body += ` commit id: "${commit}"\n`
46-
body += ` checkout ${HEAD_REF}\n`
47-
body += ` merge ${head}\n`
48+
body += ` checkout ${escapedHeadRef}\n`
49+
body += ` merge ${escapedHead}\n`
4850
body += '```'
4951

5052
if (PR_NUMBER !== '') {

0 commit comments

Comments
 (0)