From 22431f06f4e1a4b850ddce0cbe964330c98c8516 Mon Sep 17 00:00:00 2001 From: Chris Estreich Date: Thu, 22 May 2025 12:31:55 -0700 Subject: [PATCH] Fix changelog generation (#3859) --- .changeset/changelog-config.js | 2 -- .changeset/little-pillows-type.md | 5 +++++ .github/workflows/changeset-release.yml | 19 ------------------- package.json | 3 +-- 4 files changed, 6 insertions(+), 23 deletions(-) create mode 100644 .changeset/little-pillows-type.md diff --git a/.changeset/changelog-config.js b/.changeset/changelog-config.js index 1e64dbf093..0ab9a9e48e 100644 --- a/.changeset/changelog-config.js +++ b/.changeset/changelog-config.js @@ -1,5 +1,3 @@ -// Half-works to simplify the format but needs 'overwrite_changeset_changelog.py' in GHA to finish formatting - const getReleaseLine = async (changeset) => { const [firstLine] = changeset.summary .split("\n") diff --git a/.changeset/little-pillows-type.md b/.changeset/little-pillows-type.md new file mode 100644 index 0000000000..f4bec73c84 --- /dev/null +++ b/.changeset/little-pillows-type.md @@ -0,0 +1,5 @@ +--- +"roo-cline": patch +--- + +Fix changeset (again) diff --git a/.github/workflows/changeset-release.yml b/.github/workflows/changeset-release.yml index 0f7f1dc772..1ec60d4bad 100644 --- a/.github/workflows/changeset-release.yml +++ b/.github/workflows/changeset-release.yml @@ -100,25 +100,6 @@ jobs: fetch-depth: 0 ref: ${{ steps.checkout-ref.outputs.git_ref }} - # Get current and previous versions to edit changelog entry - - name: Get version - id: get_version - run: | - VERSION=$(git show HEAD:package.json | jq -r '.version') - echo "version=$VERSION" >> $GITHUB_OUTPUT - PREV_VERSION=$(git show origin/main:package.json | jq -r '.version') - echo "prev_version=$PREV_VERSION" >> $GITHUB_OUTPUT - echo "version=$VERSION" - echo "prev_version=$PREV_VERSION" - - # Update CHANGELOG.md with proper format - - name: Update Changelog Format - if: ${{ !contains(github.event.pull_request.labels.*.name, 'changelog-ready') }} - env: - VERSION: ${{ steps.get_version.outputs.version }} - PREV_VERSION: ${{ steps.get_version.outputs.prev_version }} - run: python .github/scripts/overwrite_changeset_changelog.py - # Commit and push changelog updates - name: Push Changelog updates if: ${{ !contains(github.event.pull_request.labels.*.name, 'changelog-ready') }} diff --git a/package.json b/package.json index 8d216b9820..5031d3d30d 100644 --- a/package.json +++ b/package.json @@ -14,8 +14,7 @@ "clean": "turbo clean --log-order grouped --output-logs new-only && rimraf dist out bin .vite-port .turbo", "build": "pnpm --filter roo-cline vsix", "build:nightly": "pnpm --filter @roo-code/vscode-nightly vsix", - "publish": "pnpm build && changeset publish && pnpm install --frozen-lockfile", - "changeset:version": "changeset version && pnpm install --frozen-lockfile", + "changeset:version": "cp CHANGELOG.md src/CHANGELOG.md && changeset version && cp -vf src/CHANGELOG.md .", "knip": "pnpm --filter @roo-code/build build && knip --include files", "update-contributors": "node scripts/update-contributors.js" },