From 0692e120facc6ee7b79dc98a4eb287b837f754b2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 11 Feb 2026 13:22:25 +0000
Subject: [PATCH] Fix CI after switching to pnpm (#32449)

* Simplify CI for shared-components

Now that we use pnpm which understands monorepos we can skip manually installing shared-components in CI

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix docs workflow not being able to find pnpm version

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix storybook workflow not seeing lockfile and using wrong package manager

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

* Fix dockerbuild

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

---------

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .dockerignore                                             | 1 +
 .github/workflows/docs.yml                                | 2 ++
 .github/workflows/shared-component-publish.yaml           | 5 -----
 .github/workflows/shared-component-storybook-publish.yaml | 1 +
 .github/workflows/static_analysis.yaml                    | 6 ------
 scripts/docker-link-repos.sh                              | 3 +--
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 70377fccdd..40f4110874 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,6 +7,7 @@ karma-reports/
 .idea/
 .tmp/
 config.json*
+.link-config
 # Exclude the playwright directory as much as we can as the snapshots are huge and we bind mount it in
 playwright/
 !playwright/docker-entrypoint.sh
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index fed2bc422d..3ead30584c 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -34,6 +34,8 @@ jobs:
                   path: matrix-js-sdk
 
             - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
+              with:
+                  package_json_file: element-web/package.json
             - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
               with:
                   cache: "pnpm"
diff --git a/.github/workflows/shared-component-publish.yaml b/.github/workflows/shared-component-publish.yaml
index 6355210a65..1ec7775297 100644
--- a/.github/workflows/shared-component-publish.yaml
+++ b/.github/workflows/shared-component-publish.yaml
@@ -31,11 +31,6 @@ jobs:
             - name: 🛠️ Setup EW
               run: pnpm install --frozen-lockfile
 
-            - name: 🛠️ Setup
-              # When running `install` it also calls the `prepare` step which generates
-              # a build
-              run: pnpm --dir packages/shared-components install --frozen-lockfile
-
             - name: 🚀 Publish to npm
               working-directory: packages/shared-components
               run: npm publish --access public --provenance
diff --git a/.github/workflows/shared-component-storybook-publish.yaml b/.github/workflows/shared-component-storybook-publish.yaml
index d6f8d7bde7..8dbbaa7f86 100644
--- a/.github/workflows/shared-component-storybook-publish.yaml
+++ b/.github/workflows/shared-component-storybook-publish.yaml
@@ -39,4 +39,5 @@ jobs:
                   apiToken: ${{ secrets.CF_PAGES_TOKEN }}
                   accountId: ${{ secrets.CF_PAGES_ACCOUNT_ID }}
                   workingDirectory: "packages/shared-components"
+                  packageManager: "pnpm"
                   command: pages deploy storybook-static --project-name=shared-components-storybook
diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml
index 0c5cfb1b16..aed835e9e8 100644
--- a/.github/workflows/static_analysis.yaml
+++ b/.github/workflows/static_analysis.yaml
@@ -36,9 +36,6 @@ jobs:
             - name: Typecheck
               run: "pnpm run lint:types"
 
-            - name: Install Shared Component Dependencies
-              run: "pnpm --dir packages/shared-components install"
-
             - name: Typecheck Shared Components
               run: "pnpm --dir packages/shared-components run lint:types"
 
@@ -100,9 +97,6 @@ jobs:
             - name: Run Linter
               run: "pnpm run lint:js"
 
-            - name: Install Shared Component Deps
-              run: "pnpm --dir packages/shared-components install --frozen-lockfile"
-
             - name: Run Linter
               run: "pnpm --dir packages/shared-components run lint:js"
 
diff --git a/scripts/docker-link-repos.sh b/scripts/docker-link-repos.sh
index fc3019bec6..5e06609003 100755
--- a/scripts/docker-link-repos.sh
+++ b/scripts/docker-link-repos.sh
@@ -21,9 +21,8 @@ fi
 echo "Linking js-sdk"
 git clone --depth 1 --branch $JS_SDK_BRANCH "$JS_SDK_REPO" js-sdk
 cd js-sdk
-pnpm link
 pnpm install
 cd ../
 
 echo "Setting up element-web with js-sdk package"
-pnpm link matrix-js-sdk
+pnpm link ./js-sdk