From 0adc276a6b5894b74fe10c9212b1cafdc678eb7c Mon Sep 17 00:00:00 2001
From: Wojtek Majewski <wojciech.majewski@pm.me>
Date: Tue, 11 Nov 2025 17:23:54 +0100
Subject: [PATCH] feat: fix client subscription ci issues

---
 .claude/skills/restack/SKILL.md        |  6 ++++--
 .github/actions/setup/action.yml       |  4 ++++
 .github/workflows/release.yml          | 12 +-----------
 .github/workflows/type-test-health.yml | 12 +-----------
 4 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/.claude/skills/restack/SKILL.md b/.claude/skills/restack/SKILL.md
index 0ccbb3619..6d1002bec 100644
--- a/.claude/skills/restack/SKILL.md
+++ b/.claude/skills/restack/SKILL.md
@@ -1,7 +1,7 @@
 ---
 name: restack
 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.
-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:*)
+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:*)
 ---
 
 <critical>
@@ -17,13 +17,14 @@ allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(g
 !`git --no-pager -c color.ui=false status`
 
 **Current stack:**
-!`gt --no-color log short --stack`
+!`gt log short --stack`
 
 ## Workflow
 
 ### 1. Analyze State
 
 Check `git status` output above:
+
 - **"rebase in progress"** or **"Unmerged paths"** → Already in conflict, skip to step 3
 - **Clean working tree** → Proceed to step 2
 
@@ -34,6 +35,7 @@ gt restack
 ```
 
 **Outcomes:**
+
 - **Success** → Acknowledge and skip to step 4
 - **Conflicts** → Proceed to step 3
 
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index 191c20034..a69113ec0 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -19,3 +19,7 @@ runs:
     - name: Install dependencies
       shell: bash
       run: pnpm install --frozen-lockfile --prefer-offline
+
+    - name: Rebuild packages that need postinstall (onlyBuiltDependencies)
+      shell: bash
+      run: pnpm rebuild supabase sharp
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 56970e6a9..d2f0360f4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,22 +22,12 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: pnpm/action-setup@v4
-        with:
-          version: '10.20.0'
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-          cache: 'pnpm'
-
       - name: Setup Atlas
         uses: ariga/setup-atlas@master
         with:
           cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}
 
-      - name: Install Dependencies
-        run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
 
       - name: Create Release Pull Request
         uses: changesets/action@v1
diff --git a/.github/workflows/type-test-health.yml b/.github/workflows/type-test-health.yml
index 43f8a096d..9b3201c8c 100644
--- a/.github/workflows/type-test-health.yml
+++ b/.github/workflows/type-test-health.yml
@@ -21,17 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 10.20.0
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: '24'
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+      - uses: ./.github/actions/setup
 
       - name: Run Type Testing Health Check
         run: pnpm nx test:types:health dsl