diff --git a/.github/workflows/release-make.yml b/.github/workflows/release-make.yml index 87419f033..7091bcd4d 100644 --- a/.github/workflows/release-make.yml +++ b/.github/workflows/release-make.yml @@ -24,10 +24,6 @@ on: description: List of github projects (owner/repo) which should have their dependency bumped to the newly released version (in JSON string array string syntax) type: string required: false - include-changes: - description: Project to include changelog entries from in this release. - type: string - required: false gpg-fingerprint: description: Fingerprint of the GPG key to use for signing the git tag and assets, if any. type: string diff --git a/scripts/release/merge-release-notes.js b/scripts/release/merge-release-notes.js index 062284923..c1aaed7ef 100755 --- a/scripts/release/merge-release-notes.js +++ b/scripts/release/merge-release-notes.js @@ -112,7 +112,14 @@ const main = async ({ github, releaseId, dependencies }) => { const { GITHUB_REPOSITORY } = process.env; const [owner, repo] = GITHUB_REPOSITORY.split("/"); + const { data: release } = await github.rest.repos.getRelease({ + owner, + repo, + release_id: releaseId, + }); + const sections = Object.fromEntries(categories.map((cat) => [cat, []])); + parseReleaseNotes(release.body, sections); for (const dependency of dependencies) { const releases = await getReleases(github, dependency); for (const release of releases) { @@ -120,12 +127,6 @@ const main = async ({ github, releaseId, dependencies }) => { } } - const { data: release } = await github.rest.repos.getRelease({ - owner, - repo, - release_id: releaseId, - }); - const intro = release.body.split(HEADING_PREFIX, 2)[0].trim(); let output = "";