Skip to content

There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.

ci: fix release notes generation (#8815)

Brooooooklyn44e00f67c4c9
diff --git a/tools/changelog/index.js b/tools/changelog/index.js
index 5541b9537d..911c4edf95 100644
--- a/tools/changelog/index.js
+++ b/tools/changelog/index.js
@@ -64,15 +64,18 @@ async function getChangeLog(repo, previousCommit, currentCommit) {
const revWalk = repo.revWalk();
+ let headId = repo.head().target();
+
if (currentCommit) {
const commit =
- repo.findCommit(currentCommit) ?? findTagByName(repo, previousCommit);
+ repo.findCommit(currentCommit) ?? findTagByName(repo, currentCommit);
if (!commit) {
console.log(
`Current commit ${currentCommit} not found in ${repo.path()}`
);
return '';
}
+ headId = commit.id();
revWalk.push(commit.id());
} else {
revWalk.pushHead();
@@ -89,7 +92,7 @@ async function getChangeLog(repo, previousCommit, currentCommit) {
email: commit.author().email(),
},
});
- if (commitId.startsWith(previousCommit)) {
+ if (commitId === prevCommit.id()) {
break;
}
}
@@ -98,6 +101,9 @@ async function getChangeLog(repo, previousCommit, currentCommit) {
token: process.env.GITHUB_TOKEN,
});
+ parseConfig.from = prevCommit.id();
+ parseConfig.to = headId;
+
const parsedCommits = parseCommits(commits, parseConfig);
await resolveAuthors(parsedCommits, parseConfig);
return generateMarkdown(parsedCommits, parseConfig)
diff --git a/tools/changelog/package.json b/tools/changelog/package.json
index 1d46a83131..22d96e4fd0 100644
--- a/tools/changelog/package.json
+++ b/tools/changelog/package.json
@@ -8,8 +8,8 @@
"dependencies": {
"@napi-rs/simple-git": "^0.1.18",
"@slack/web-api": "^7.3.4",
- "changelogithub": "^0.13.9",
- "jsx-slack": "^6.1.1",
+ "changelogithub": "^0.13.11",
+ "jsx-slack": "^6.1.2",
"marked": "^15.0.0"
},
"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index f2790cb708..3d9ebc44b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -256,8 +256,8 @@ __metadata:
"@napi-rs/simple-git": "npm:^0.1.18"
"@slack/web-api": "npm:^7.3.4"
"@types/node": "npm:^20.14.12"
- changelogithub: "npm:^0.13.9"
- jsx-slack: "npm:^6.1.1"
+ changelogithub: "npm:^0.13.11"
+ jsx-slack: "npm:^6.1.2"
marked: "npm:^15.0.0"
languageName: unknown
linkType: soft
@@ -16659,7 +16659,7 @@ __metadata:
languageName: node
linkType: hard
-"changelogithub@npm:^0.13.9":
+"changelogithub@npm:^0.13.11":
version: 0.13.11
resolution: "changelogithub@npm:0.13.11"
dependencies:
@@ -23598,7 +23598,7 @@ __metadata:
languageName: node
linkType: hard
-"jsx-slack@npm:^6.1.1":
+"jsx-slack@npm:^6.1.1, jsx-slack@npm:^6.1.2":
version: 6.1.2
resolution: "jsx-slack@npm:6.1.2"
dependencies: