Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion scripts/release/release.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,10 @@ async function publish(version) {
const mergeTitle = run("git", ["show", "-s", "--format=%s", mergeSha], {
cwd: root,
});
if (mergeTitle !== subject) fail(`merge commit title is not '${subject}'`);
const githubMergeTitle = `${subject} (#${pr.number})`;
if (mergeTitle !== subject && mergeTitle !== githubMergeTitle) {
fail(`merge commit title does not match PR #${pr.number}`);
}
await checkVersions({ root, expected: version, ref: mergeSha });
const sourceConfig = await releaseConfig(gitReader(root, mergeSha));
validateMinimumPublicVersion(version, sourceConfig);
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/tests/release-tooling.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,9 @@ describe("release publishing", () => {
const releaseHead = f.git(["rev-parse", "HEAD"]).stdout.trim();
expect(f.git(["switch", "main"]).status).toBe(0);
expect(f.git(["merge", "--squash", "release/v0.6.0-rc.1"]).status).toBe(0);
expect(f.git(["commit", "-m", "chore: release v0.6.0-rc.1"]).status).toBe(
0,
);
expect(
f.git(["commit", "-m", "chore: release v0.6.0-rc.1 (#123)"]).status,
).toBe(0);
const mergeSha = f.git(["rev-parse", "HEAD"]).stdout.trim();
expect(mergeSha).not.toBe(releaseHead);
expect(f.git(["push", "origin", "main"]).status).toBe(0);
Expand Down