Skip to content

Commit 0adc276

Browse files
committed
feat: fix client subscription ci issues
1 parent 27688fe commit 0adc276

File tree

4 files changed

+10
-24
lines changed

4 files changed

+10
-24
lines changed

.claude/skills/restack/SKILL.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
name: restack
33
description: Use when user asks to "restack", "resolve conflicts", "gt restack", or mentions restack conflicts. Guides through gt restack conflicts with intelligent diagnostics and resolution.
4-
allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(git diff:*), Bash(git log:*), Bash(git ls-tree:*), Bash(pnpm install:*), Bash(git status:*), Bash(gt log:*), Bash(rm pnpm-lock.yaml), Bash(gt add -A:*), Bash(git checkout --theirs:*), Bash(git checkout --ours:*)
4+
allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(gt abort:*), Bash(git show:*), Bash(git diff:*), Bash(git log:*), Bash(git ls-tree:*), Bash(pnpm install:*), Bash(git status:*), Bash(gt log:*), Bash(rm pnpm-lock.yaml), Bash(gt add -A:*), Bash(git checkout --theirs:*), Bash(git checkout --ours:*), Bash(git --no-pager -c color.ui=false status:*), Bash(gt log short --stack:*), Bash(git --no-pager -c color.ui=false diff --name-only --diff-filter=U --no-renames:*), Bash(git --no-pager -c color.ui=false diff:*)
55
---
66

77
<critical>
@@ -17,13 +17,14 @@ allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(g
1717
!`git --no-pager -c color.ui=false status`
1818

1919
**Current stack:**
20-
!`gt --no-color log short --stack`
20+
!`gt log short --stack`
2121

2222
## Workflow
2323

2424
### 1. Analyze State
2525

2626
Check `git status` output above:
27+
2728
- **"rebase in progress"** or **"Unmerged paths"** → Already in conflict, skip to step 3
2829
- **Clean working tree** → Proceed to step 2
2930

@@ -34,6 +35,7 @@ gt restack
3435
```
3536

3637
**Outcomes:**
38+
3739
- **Success** → Acknowledge and skip to step 4
3840
- **Conflicts** → Proceed to step 3
3941

.github/actions/setup/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ runs:
1919
- name: Install dependencies
2020
shell: bash
2121
run: pnpm install --frozen-lockfile --prefer-offline
22+
23+
- name: Rebuild packages that need postinstall (onlyBuiltDependencies)
24+
shell: bash
25+
run: pnpm rebuild supabase sharp

.github/workflows/release.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,12 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424

25-
- uses: pnpm/action-setup@v4
26-
with:
27-
version: '10.20.0'
28-
29-
- uses: actions/setup-node@v4
30-
with:
31-
node-version: '24'
32-
cache: 'pnpm'
33-
3425
- name: Setup Atlas
3526
uses: ariga/setup-atlas@master
3627
with:
3728
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
3829

39-
- name: Install Dependencies
40-
run: pnpm install --frozen-lockfile
30+
- uses: ./.github/actions/setup
4131

4232
- name: Create Release Pull Request
4333
uses: changesets/action@v1

.github/workflows/type-test-health.yml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,7 @@ jobs:
2121
steps:
2222
- uses: actions/checkout@v4
2323

24-
- uses: pnpm/action-setup@v2
25-
with:
26-
version: 10.20.0
27-
28-
- uses: actions/setup-node@v4
29-
with:
30-
node-version: '24'
31-
cache: 'pnpm'
32-
33-
- name: Install dependencies
34-
run: pnpm install --frozen-lockfile
24+
- uses: ./.github/actions/setup
3525

3626
- name: Run Type Testing Health Check
3727
run: pnpm nx test:types:health dsl

0 commit comments

Comments
 (0)