From c7a0879e5364b73a6128595b977c75480aab9263 Mon Sep 17 00:00:00 2001 From: Nikos Douvlis Date: Fri, 15 Nov 2024 12:02:43 +0200 Subject: [PATCH] chore(repo): Fix changeset release --- .github/actions/version-prepatch/action.yml | 3 +-- .github/workflows/release-canary.yml | 2 +- .github/workflows/release-snapshot.yml | 2 +- .github/workflows/release.yml | 2 +- package.json | 6 +++--- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/actions/version-prepatch/action.yml b/.github/actions/version-prepatch/action.yml index 852ab285a2..4995e755a5 100644 --- a/.github/actions/version-prepatch/action.yml +++ b/.github/actions/version-prepatch/action.yml @@ -14,8 +14,7 @@ runs: - name: Bump prepatch version id: bump-prepatch-version shell: bash - run: pnpm version prepatch --no-git-tag-version --preid=$TAG --workspace=$PACKAGE + run: pnpm version-packages prepatch --no-git-tag-version --preid=$TAG --workspace=$PACKAGE env: PACKAGE: ${{ inputs.package }} TAG: ${{ inputs.tag }} - \ No newline at end of file diff --git a/.github/workflows/release-canary.yml b/.github/workflows/release-canary.yml index 91c5982f91..2c36029247 100644 --- a/.github/workflows/release-canary.yml +++ b/.github/workflows/release-canary.yml @@ -38,7 +38,7 @@ jobs: - name: Version packages for canary id: version-packages - run: pnpm version:canary | tail -1 >> "$GITHUB_OUTPUT" + run: pnpm version-packages:canary | tail -1 >> "$GITHUB_OUTPUT" - name: Build release if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release-snapshot.yml b/.github/workflows/release-snapshot.yml index ca7c40dd0a..9224be235d 100644 --- a/.github/workflows/release-snapshot.yml +++ b/.github/workflows/release-snapshot.yml @@ -87,7 +87,7 @@ jobs: - name: Version packages for snapshot id: version-packages - run: pnpm version:snapshot ${{ steps.extract-snapshot-name.outputs.name }} | tail -1 >> "$GITHUB_OUTPUT" + run: pnpm version-packages:snapshot ${{ steps.extract-snapshot-name.outputs.name }} | tail -1 >> "$GITHUB_OUTPUT" - name: Build release if: steps.version-packages.outputs.success == '1' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 81ffb9293b..fd75e40eb3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -59,7 +59,7 @@ jobs: title: 'ci(repo): Version packages' publish: pnpm release # Workaround for https://github.com/changesets/changesets/issues/421 - version: pnpm version + version: pnpm version-packages env: GITHUB_TOKEN: ${{ secrets.CLERK_COOKIE_PAT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/package.json b/package.json index bac42e0b80..6778850c63 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "test:integration:tanstack-start": "E2E_APP_ID=tanstack.start pnpm test:integration:base --grep @tanstack-start", "test:integration:vue": "E2E_APP_ID=vue.vite pnpm test:integration:base --grep @vue", "turbo:clean": "turbo daemon clean", - "version": "changeset version && pnpm install --lockfile-only --engine-strict=false", - "version:canary": "./scripts/canary.mjs", - "version:snapshot": "./scripts/snapshot.mjs", + "version-packages": "changeset version && pnpm install --lockfile-only --engine-strict=false", + "version-packages:canary": "./scripts/canary.mjs", + "version-packages:snapshot": "./scripts/snapshot.mjs", "yalc:all": "for d in packages/*/; do echo $d; cd $d; pnpm dlx yalc push --replace --sig; cd '../../'; done" }, "devDependencies": {