Skip to content

Commit b574b4c

Browse files
committed
fix(ci): restore changesets version PR flow
1 parent 8f4d144 commit b574b4c

4 files changed

Lines changed: 16 additions & 73 deletions

File tree

.github/workflows/release.yml

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,30 @@ on:
55
branches: [main, alpha, beta, rc]
66

77
concurrency:
8-
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
9-
cancel-in-progress: true
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: false
1010

1111
env:
1212
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
13-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1413

15-
permissions: {}
14+
permissions:
15+
contents: read
1616

1717
jobs:
1818
release:
1919
name: Release
20-
if: ${{ github.repository_owner == 'TanStack' && !contains(github.event.head_commit.message, '[skip ci]') }}
20+
if: ${{ github.repository_owner == 'TanStack' }}
2121
runs-on: ubuntu-latest
2222
permissions:
2323
contents: write
2424
id-token: write
25-
pull-requests: read
26-
statuses: read
25+
pull-requests: write
2726
steps:
2827
- name: Checkout
2928
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3029
with:
3130
fetch-depth: 0
32-
persist-credentials: false
31+
persist-credentials: true # changesets/action pushes version PR commits
3332
- name: Setup Tools
3433
uses: tanstack/config/.github/setup@e4b48f16568324f76f467aa4c2aac2f05db632c3 # main
3534
- name: Build
@@ -40,28 +39,18 @@ jobs:
4039
run: pnpm --filter @tanstack/cli exec playwright install --with-deps chrome
4140
- name: E2E Blocking
4241
run: pnpm --filter @tanstack/cli test:e2e
43-
- name: Generate Semantic Changeset Fallback
44-
run: pnpm run changeset:generate
4542

4643
- name: Prepare Release Context
4744
id: release
4845
run: pnpm run release:prepare
4946

50-
- name: Version Packages
51-
if: steps.release.outputs.has_changesets == 'true'
52-
run: pnpm run changeset:version
53-
54-
- name: Detect Versioning Changes
55-
if: steps.release.outputs.has_changesets == 'true'
56-
id: changes
57-
run: pnpm run release:detect-changes
58-
59-
- name: Commit Version Updates
60-
if: steps.release.outputs.has_changesets == 'true' && steps.changes.outputs.has_changes == 'true'
61-
run: pnpm run release:commit-and-push
62-
63-
- name: Publish Packages
64-
if: steps.release.outputs.has_changesets == 'true' && steps.changes.outputs.has_changes == 'true'
47+
- name: Create Release Pull Request or Publish
48+
id: changesets
49+
uses: changesets/action@63a615b9cd06ba9a3e6d13796c7fbcb080a60a0b # v1.8.0
50+
with:
51+
version: pnpm run changeset:version
52+
publish: pnpm run changeset:publish --tag ${{ steps.release.outputs.npm_tag }}
53+
title: 'ci: Version Packages'
54+
commit: 'ci: changeset release'
6555
env:
66-
NPM_TAG: ${{ steps.release.outputs.npm_tag }}
67-
run: pnpm changeset publish --tag "$NPM_TAG"
56+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
"changeset": "changeset",
2222
"changeset:generate": "node scripts/generate-semantic-changeset.mjs",
2323
"release:prepare": "node scripts/prepare-release.mjs",
24-
"release:detect-changes": "node scripts/release-detect-changes.mjs",
25-
"release:commit-and-push": "node scripts/release-commit-and-push.mjs",
2624
"changeset:publish": "changeset publish",
2725
"changeset:version": "changeset version && pnpm install --no-frozen-lockfile"
2826
},

scripts/release-commit-and-push.mjs

Lines changed: 0 additions & 19 deletions
This file was deleted.

scripts/release-detect-changes.mjs

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)