Skip to content

Commit 1eddb02

Browse files
authored
chore(ci): rename version tag (#437)
1 parent fa07bdf commit 1eddb02

File tree

4 files changed

+38
-19
lines changed

4 files changed

+38
-19
lines changed

scripts/release/__tests__/create-release-issue.test.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,21 @@ describe('create release issue', () => {
4646
current: '0.0.1',
4747
releaseType: 'patch',
4848
},
49+
4950
php: {
5051
current: '0.0.1',
5152
releaseType: 'patch',
5253
},
54+
5355
java: {
5456
current: '0.0.1',
5557
releaseType: 'patch',
5658
},
5759
})
5860
).toMatchInlineSnapshot(`
59-
"- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
60-
- [x] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
61-
- [x] php: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_"
61+
"- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
62+
- [x] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
63+
- [x] php: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_"
6264
`);
6365
});
6466

@@ -69,20 +71,22 @@ describe('create release issue', () => {
6971
current: '0.0.1',
7072
releaseType: 'patch',
7173
},
74+
7275
php: {
7376
current: '0.0.1',
7477
releaseType: null,
7578
noCommit: true,
7679
},
80+
7781
java: {
7882
current: '0.0.1',
7983
releaseType: 'patch',
8084
},
8185
})
8286
).toMatchInlineSnapshot(`
83-
"- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
84-
- [x] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
85-
- ~php: v0.0.1 (no commit)~"
87+
"- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
88+
- [x] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
89+
- ~php: 0.0.1 (no commit)~"
8690
`);
8791
});
8892

@@ -93,21 +97,23 @@ describe('create release issue', () => {
9397
current: '0.0.1',
9498
releaseType: 'patch',
9599
},
100+
96101
php: {
97102
current: '0.0.1',
98103
releaseType: 'minor',
99104
},
105+
100106
java: {
101107
current: '0.0.1',
102108
releaseType: 'patch',
103109
skipRelease: true,
104110
},
105111
})
106112
).toMatchInlineSnapshot(`
107-
"- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
108-
- [ ] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_
113+
"- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
114+
- [ ] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_
109115
- No \`feat\` or \`fix\` commit, thus unchecked by default.
110-
- [x] php: v0.0.1 -> \`minor\` _(e.g. v0.1.0)_"
116+
- [x] php: 0.0.1 -> \`minor\` _(e.g. 0.1.0)_"
111117
`);
112118
});
113119

scripts/release/__tests__/process-release.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ describe('process release', () => {
77
const versions = getVersionsToRelease(`
88
## Version Changes
99
10-
- [x] javascript: v1.0.0 -> \`minor\` (e.g. v1.1.0)
11-
- [x] php: v2.0.0 -> \`patch\` (e.g. v2.0.1)
12-
- [ ] java: v3.0.0 -> \`patch\` (e.g. v3.0.1)
10+
- [x] javascript: 1.0.0 -> \`minor\` (e.g. 1.1.0)
11+
- [x] php: 2.0.0 -> \`patch\` (e.g. 2.0.1)
12+
- [ ] java: 3.0.0 -> \`patch\` (e.g. 3.0.1)
1313
`);
1414

1515
expect(Object.keys(versions)).toEqual(['javascript', 'php']);

scripts/release/create-release-issue.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function getVersionChangesText(versions: Versions): string {
4141
const { current, releaseType, noCommit, skipRelease } = versions[lang];
4242

4343
if (noCommit) {
44-
return `- ~${lang}: v${current} (${TEXT.noCommit})~`;
44+
return `- ~${lang}: ${current} (${TEXT.noCommit})~`;
4545
}
4646

4747
if (!current) {
@@ -51,7 +51,7 @@ export function getVersionChangesText(versions: Versions): string {
5151
const next = semver.inc(current, releaseType!);
5252
const checked = skipRelease ? ' ' : 'x';
5353
return [
54-
`- [${checked}] ${lang}: v${current} -> \`${releaseType}\` _(e.g. v${next})_`,
54+
`- [${checked}] ${lang}: ${current} -> \`${releaseType}\` _(e.g. ${next})_`,
5555
skipRelease && TEXT.descriptionForSkippedLang,
5656
]
5757
.filter(Boolean)

scripts/release/process-release.ts

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export function getVersionsToRelease(issueBody: string): VersionsToRelease {
8282
getMarkdownSection(issueBody, TEXT.versionChangeHeader)
8383
.split('\n')
8484
.forEach((line) => {
85-
const result = line.match(/- \[x\] (.+): v(.+) -> `(.+)`/);
85+
const result = line.match(/- \[x\] (.+): (.+) -> `(.+)`/);
8686
if (!result) {
8787
return;
8888
}
@@ -159,9 +159,9 @@ async function updateChangelog({
159159
const existingContent = (await exists(changelogPath))
160160
? (await fsp.readFile(changelogPath)).toString()
161161
: '';
162-
const changelogHeader = `## [v${next}](${getGitHubUrl(
162+
const changelogHeader = `## [${next}](${getGitHubUrl(
163163
lang
164-
)}/compare/v${current}...v${next})`;
164+
)}/compare/${current}...${next})`;
165165
const newChangelog = getMarkdownSection(
166166
getMarkdownSection(issueBody, TEXT.changelogHeader),
167167
`### ${lang}`
@@ -172,6 +172,16 @@ async function updateChangelog({
172172
);
173173
}
174174

175+
function formatGitTag({
176+
lang,
177+
version,
178+
}: {
179+
lang: string;
180+
version: string;
181+
}): string {
182+
return lang === 'go' ? `v${version}` : version;
183+
}
184+
175185
async function isAuthorizedRelease(): Promise<boolean> {
176186
const octokit = getOctokit(process.env.GITHUB_TOKEN!);
177187
const { data: members } = await octokit.rest.teams.listMembersInOrg({
@@ -266,11 +276,14 @@ async function processRelease(): Promise<void> {
266276

267277
const { current, releaseType } = versionsToRelease[lang];
268278
const next = semver.inc(current, releaseType);
279+
const tag = formatGitTag({ lang, version: next! });
269280
await gitCommit({
270-
message: `chore: release v${next}`,
281+
message: `chore: release ${tag}`,
282+
cwd: tempGitDir,
283+
});
284+
await execa('git', ['tag', tag], {
271285
cwd: tempGitDir,
272286
});
273-
await execa('git', ['tag', `v${next}`], { cwd: tempGitDir });
274287
await run(`git push --follow-tags`, { cwd: tempGitDir });
275288
}
276289

0 commit comments

Comments
 (0)