From 8436888bfbfcffcda8902cfd262b71d96a08ffee Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Wed, 27 Apr 2022 11:37:16 +0200 Subject: [PATCH 1/3] chore(ci): rename version tag --- scripts/release/process-release.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/release/process-release.ts b/scripts/release/process-release.ts index cc1d11e929..dab3d3e619 100755 --- a/scripts/release/process-release.ts +++ b/scripts/release/process-release.ts @@ -270,7 +270,7 @@ async function processRelease(): Promise { message: `chore: release v${next}`, cwd: tempGitDir, }); - await execa('git', ['tag', `v${next}`], { cwd: tempGitDir }); + await execa('git', ['tag', `${next}`], { cwd: tempGitDir }); await run(`git push --follow-tags`, { cwd: tempGitDir }); } From f48ba85ddc0102ed61b77ae4eac58bcf4bb9812a Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Thu, 28 Apr 2022 11:02:06 +0200 Subject: [PATCH 2/3] chore: remove v prefix and fix tests --- .../__tests__/create-release-issue.test.ts | 24 ++++++++++++------- .../release/__tests__/process-release.test.ts | 6 ++--- scripts/release/create-release-issue.ts | 4 ++-- scripts/release/process-release.ts | 23 ++++++++++++++---- 4 files changed, 38 insertions(+), 19 deletions(-) diff --git a/scripts/release/__tests__/create-release-issue.test.ts b/scripts/release/__tests__/create-release-issue.test.ts index d6b0185cfc..467758164f 100644 --- a/scripts/release/__tests__/create-release-issue.test.ts +++ b/scripts/release/__tests__/create-release-issue.test.ts @@ -46,19 +46,21 @@ describe('create release issue', () => { current: '0.0.1', releaseType: 'patch', }, + php: { current: '0.0.1', releaseType: 'patch', }, + java: { current: '0.0.1', releaseType: 'patch', }, }) ).toMatchInlineSnapshot(` - "- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ - - [x] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ - - [x] php: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_" + "- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ + - [x] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ + - [x] php: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_" `); }); @@ -69,20 +71,22 @@ describe('create release issue', () => { current: '0.0.1', releaseType: 'patch', }, + php: { current: '0.0.1', releaseType: null, noCommit: true, }, + java: { current: '0.0.1', releaseType: 'patch', }, }) ).toMatchInlineSnapshot(` - "- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ - - [x] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ - - ~php: v0.0.1 (no commit)~" + "- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ + - [x] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ + - ~php: 0.0.1 (no commit)~" `); }); @@ -93,10 +97,12 @@ describe('create release issue', () => { current: '0.0.1', releaseType: 'patch', }, + php: { current: '0.0.1', releaseType: 'minor', }, + java: { current: '0.0.1', releaseType: 'patch', @@ -104,10 +110,10 @@ describe('create release issue', () => { }, }) ).toMatchInlineSnapshot(` - "- [x] javascript: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ - - [ ] java: v0.0.1 -> \`patch\` _(e.g. v0.0.2)_ + "- [x] javascript: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ + - [ ] java: 0.0.1 -> \`patch\` _(e.g. 0.0.2)_ - No \`feat\` or \`fix\` commit, thus unchecked by default. - - [x] php: v0.0.1 -> \`minor\` _(e.g. v0.1.0)_" + - [x] php: 0.0.1 -> \`minor\` _(e.g. 0.1.0)_" `); }); diff --git a/scripts/release/__tests__/process-release.test.ts b/scripts/release/__tests__/process-release.test.ts index 4575074f58..a996f31a15 100644 --- a/scripts/release/__tests__/process-release.test.ts +++ b/scripts/release/__tests__/process-release.test.ts @@ -7,9 +7,9 @@ describe('process release', () => { const versions = getVersionsToRelease(` ## Version Changes - - [x] javascript: v1.0.0 -> \`minor\` (e.g. v1.1.0) - - [x] php: v2.0.0 -> \`patch\` (e.g. v2.0.1) - - [ ] java: v3.0.0 -> \`patch\` (e.g. v3.0.1) + - [x] javascript: 1.0.0 -> \`minor\` (e.g. 1.1.0) + - [x] php: 2.0.0 -> \`patch\` (e.g. 2.0.1) + - [ ] java: 3.0.0 -> \`patch\` (e.g. 3.0.1) `); expect(Object.keys(versions)).toEqual(['javascript', 'php']); diff --git a/scripts/release/create-release-issue.ts b/scripts/release/create-release-issue.ts index b72a52d359..0261d01a7d 100755 --- a/scripts/release/create-release-issue.ts +++ b/scripts/release/create-release-issue.ts @@ -41,7 +41,7 @@ export function getVersionChangesText(versions: Versions): string { const { current, releaseType, noCommit, skipRelease } = versions[lang]; if (noCommit) { - return `- ~${lang}: v${current} (${TEXT.noCommit})~`; + return `- ~${lang}: ${current} (${TEXT.noCommit})~`; } if (!current) { @@ -51,7 +51,7 @@ export function getVersionChangesText(versions: Versions): string { const next = semver.inc(current, releaseType!); const checked = skipRelease ? ' ' : 'x'; return [ - `- [${checked}] ${lang}: v${current} -> \`${releaseType}\` _(e.g. v${next})_`, + `- [${checked}] ${lang}: ${current} -> \`${releaseType}\` _(e.g. ${next})_`, skipRelease && TEXT.descriptionForSkippedLang, ] .filter(Boolean) diff --git a/scripts/release/process-release.ts b/scripts/release/process-release.ts index dab3d3e619..1156ba2ca4 100755 --- a/scripts/release/process-release.ts +++ b/scripts/release/process-release.ts @@ -82,7 +82,7 @@ export function getVersionsToRelease(issueBody: string): VersionsToRelease { getMarkdownSection(issueBody, TEXT.versionChangeHeader) .split('\n') .forEach((line) => { - const result = line.match(/- \[x\] (.+): v(.+) -> `(.+)`/); + const result = line.match(/- \[x\] (.+): (.+) -> `(.+)`/); if (!result) { return; } @@ -159,9 +159,9 @@ async function updateChangelog({ const existingContent = (await exists(changelogPath)) ? (await fsp.readFile(changelogPath)).toString() : ''; - const changelogHeader = `## [v${next}](${getGitHubUrl( + const changelogHeader = `## [${next}](${getGitHubUrl( lang - )}/compare/v${current}...v${next})`; + )}/compare/${current}...${next})`; const newChangelog = getMarkdownSection( getMarkdownSection(issueBody, TEXT.changelogHeader), `### ${lang}` @@ -172,6 +172,16 @@ async function updateChangelog({ ); } +function formatGitTag({ + lang, + version, +}: { + lang: string; + version: string; +}): string { + return lang === 'go' ? `v${version}` : version; +} + async function isAuthorizedRelease(): Promise { const octokit = getOctokit(process.env.GITHUB_TOKEN!); const { data: members } = await octokit.rest.teams.listMembersInOrg({ @@ -266,11 +276,14 @@ async function processRelease(): Promise { const { current, releaseType } = versionsToRelease[lang]; const next = semver.inc(current, releaseType); + const tag = formatGitTag({ lang, version: next! }); await gitCommit({ - message: `chore: release v${next}`, + message: `chore: release ${tag}`, + cwd: tempGitDir, + }); + await execa('git', ['tag', tag], { cwd: tempGitDir, }); - await execa('git', ['tag', `${next}`], { cwd: tempGitDir }); await run(`git push --follow-tags`, { cwd: tempGitDir }); } From 116862f87b02c2fd34d4b61ed3ddaad759f8566a Mon Sep 17 00:00:00 2001 From: Eunjae Lee Date: Thu, 28 Apr 2022 11:04:25 +0200 Subject: [PATCH 3/3] chore: update cache version --- .github/.cache_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/.cache_version b/.github/.cache_version index 7af44b6c60..8ce0f0f36f 100644 --- a/.github/.cache_version +++ b/.github/.cache_version @@ -1 +1 @@ -9.1 \ No newline at end of file +9.1.1 \ No newline at end of file