Skip to content

Commit 378fa88

Browse files
millotpshortcuts
andauthored
fix(scripts): remove skip bc from the changelog [skip-bc] (#4100)
Co-authored-by: shortcuts <[email protected]>
1 parent f760ecb commit 378fa88

File tree

4 files changed

+13
-6
lines changed

4 files changed

+13
-6
lines changed

scripts/ci/codegen/createGitHubReleases.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import type { Language } from '../../types.js';
55
import { cloneRepository } from '../utils.js';
66

77
import { resolve } from 'path';
8+
import { stripCommitMessage } from '../../release/common.js';
89
import { commitStartRelease } from './text.js';
910

1011
async function createGitHubRelease(lang: Language): Promise<void> {
@@ -55,7 +56,7 @@ async function createGitHubRelease(lang: Language): Promise<void> {
5556
const content = `
5657
# New ${isMajor ? '**major** ' : ''}version released!
5758
## What's Changed
58-
${changelog}
59+
${stripCommitMessage(changelog)}
5960
6061
**Full Changelog**: ${repositoryLink}/compare/${previousVersion}...${newVersion}
6162

scripts/release/common.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,7 @@ export function getGitAuthor(): { name: string; email: string } {
3535
export async function writeJsonFile(ppath: string, data: Record<string, any>): Promise<void> {
3636
await fsp.writeFile(ppath, JSON.stringify(data, null, 2).concat('\n'));
3737
}
38+
39+
export function stripCommitMessage(message: string): string {
40+
return message.replace(/ \[skip-bc\]/g, '').replace(/ \[skip-e2e\]/g, '');
41+
}

scripts/release/createReleasePR.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
import { getPackageVersionDefault } from '../config.js';
2929
import type { Language } from '../types.js';
3030

31-
import { getFileChanges, getLastReleasedTag } from './common.js';
31+
import { getFileChanges, getLastReleasedTag, stripCommitMessage } from './common.js';
3232
import TEXT from './text.js';
3333
import type { Changelog, Commit, CommitType, ParsedCommit, Scope, Versions } from './types.js';
3434
import { updateAPIVersions } from './updateAPIVersions.js';
@@ -202,7 +202,7 @@ export function decideReleaseStrategy({
202202
console.log(`Deciding next version bump for ${lang}.`);
203203

204204
if (relevantCommits.length === 0) {
205-
console.log(` > Skipping, no commits found for ${lang}.`);
205+
console.log(` > Skipping, no commits found for ${lang}, staying on '${currentVersion}'.`);
206206

207207
versionsToPublish[lang] = { current: currentVersion };
208208

@@ -383,7 +383,7 @@ export async function createReleasePR({
383383

384384
const changelogCommit = [
385385
`[${validCommit.hash}](https://github.com/${OWNER}/${REPO}/commit/${validCommit.hash})`,
386-
validCommit.message,
386+
stripCommitMessage(validCommit.message),
387387
validCommit.prNumber
388388
? `([#${validCommit.prNumber}](https://github.com/${OWNER}/${REPO}/pull/${validCommit.prNumber}))`
389389
: undefined,

scripts/release/updateAPIVersions.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import type { Changelog, Versions } from './types.js';
1212

1313
async function updateConfigFiles(versionsToRelease: Versions): Promise<void> {
1414
// update the other versions in clients.config.json
15-
for (const lang of Object.keys(versionsToRelease)) {
16-
clientsConfig[lang].packageVersion = versionsToRelease[lang].next;
15+
for (const lang of Object.keys(versionsToRelease) as Language[]) {
16+
if (versionsToRelease[lang]?.next) {
17+
clientsConfig[lang].packageVersion = versionsToRelease[lang].next;
18+
}
1719
}
1820

1921
await writeJsonFile(toAbsolutePath('config/clients.config.json'), clientsConfig);

0 commit comments

Comments
 (0)