From 61c2b1a00700fe1eb8de519609e2e8e5b680c694 Mon Sep 17 00:00:00 2001 From: Alberto Iannaccone Date: Mon, 14 Mar 2022 12:05:53 +0100 Subject: [PATCH] Install oktokit in changelog workflow (#901) * install oktokit in changelog workflow * fix how the old changelog is cut off --- .github/workflows/compose-full-changelog.yaml | 1 + .../src/electron-main/ide-updater/ide-updater-impl.ts | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/compose-full-changelog.yaml b/.github/workflows/compose-full-changelog.yaml index 484074e4..b32d463a 100644 --- a/.github/workflows/compose-full-changelog.yaml +++ b/.github/workflows/compose-full-changelog.yaml @@ -32,6 +32,7 @@ jobs: - name: Create full changelog id: full-changelog run: | + yarn add @octokit/rest mkdir "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}" # Get the changelog file name to build diff --git a/arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts b/arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts index a87536a4..67c65f52 100644 --- a/arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts +++ b/arduino-ide-extension/src/electron-main/ide-updater/ide-updater-impl.ts @@ -81,11 +81,9 @@ export class IDEUpdaterImpl implements IDEUpdater { ? await fetch(`${CHANGELOG_BASE_URL}/${latestChangelogFileName}`) : null; const changelog = response?.ok ? await response?.text() : null; - + const currentVersionHeader = `\n\n---\n\n## ${this.updater.currentVersion}\n\n`; // We only want to see the release notes of newer versions - const currentVersionIndex = changelog?.indexOf( - `\r\n\r\n---\r\n\r\n## ${this.updater.currentVersion}\r\n\r\n` - ); + const currentVersionIndex = changelog?.indexOf(currentVersionHeader); const newChangelog = currentVersionIndex && currentVersionIndex > 0 ? changelog?.slice(0, currentVersionIndex)