From f1a0460105b8b0c35d9540b49db4157673bab559 Mon Sep 17 00:00:00 2001 From: Dotta Date: Tue, 17 Mar 2026 14:53:23 -0500 Subject: [PATCH] fix: reset lockfile changes before release publish --- .github/workflows/release.yml | 6 ++++++ doc/RELEASE-AUTOMATION-SETUP.md | 1 + 2 files changed, 7 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5342b20f..1ef1726b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -92,6 +92,9 @@ jobs: - name: Install dependencies run: pnpm install --no-frozen-lockfile + - name: Restore tracked install-time changes + run: git checkout -- pnpm-lock.yaml + - name: Configure git author run: | git config user.name "github-actions[bot]" @@ -218,6 +221,9 @@ jobs: - name: Install dependencies run: pnpm install --no-frozen-lockfile + - name: Restore tracked install-time changes + run: git checkout -- pnpm-lock.yaml + - name: Configure git author run: | git config user.name "github-actions[bot]" diff --git a/doc/RELEASE-AUTOMATION-SETUP.md b/doc/RELEASE-AUTOMATION-SETUP.md index 7e629c14..7f77003a 100644 --- a/doc/RELEASE-AUTOMATION-SETUP.md +++ b/doc/RELEASE-AUTOMATION-SETUP.md @@ -16,6 +16,7 @@ Note: - the release workflows intentionally use `pnpm install --no-frozen-lockfile` - this matches the repo's current policy where `pnpm-lock.yaml` is refreshed by GitHub automation after manifest changes land on `master` +- the publish jobs then restore `pnpm-lock.yaml` before running `scripts/release.sh`, so the release script still sees a clean worktree ## 1. Merge the Repo Changes First