From e66723230b4661e006f1fdaff4d8afe2e85b292c Mon Sep 17 00:00:00 2001 From: Felix Roos Date: Mon, 12 Oct 2026 19:39:05 +0200 Subject: [PATCH] make sure pnpm version is the same locally and in ci --- .forgejo/workflows/deploy-hot.yml | 2 -- .forgejo/workflows/deploy-warm-beta.yml | 2 -- .forgejo/workflows/deploy.yml | 2 -- .forgejo/workflows/test.yml | 2 -- package.json | 1 + pnpm-workspace.yaml | 25 +++++++++++++------------ 6 files changed, 14 insertions(+), 20 deletions(-) diff --git a/.forgejo/workflows/deploy-hot.yml b/.forgejo/workflows/deploy-hot.yml index a19917dfa..2414a382f 100644 --- a/.forgejo/workflows/deploy-hot.yml +++ b/.forgejo/workflows/deploy-hot.yml @@ -19,8 +19,6 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - uses: pnpm/action-setup@v4 - with: - version: 9.12.2 - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.forgejo/workflows/deploy-warm-beta.yml b/.forgejo/workflows/deploy-warm-beta.yml index 264f716d0..5f8410699 100644 --- a/.forgejo/workflows/deploy-warm-beta.yml +++ b/.forgejo/workflows/deploy-warm-beta.yml @@ -19,8 +19,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - with: - version: 9.12.2 - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.forgejo/workflows/deploy.yml b/.forgejo/workflows/deploy.yml index 2b47e5e17..6b686ce7e 100644 --- a/.forgejo/workflows/deploy.yml +++ b/.forgejo/workflows/deploy.yml @@ -16,8 +16,6 @@ jobs: steps: - uses: actions/checkout@v4 - uses: pnpm/action-setup@v4 - with: - version: 9.12.2 - uses: actions/setup-node@v4 with: node-version: 20 diff --git a/.forgejo/workflows/test.yml b/.forgejo/workflows/test.yml index c1db1c5f9..7f002d4e1 100644 --- a/.forgejo/workflows/test.yml +++ b/.forgejo/workflows/test.yml @@ -15,8 +15,6 @@ jobs: - name: apt install ztd run: apt update && apt install -y zstd - uses: pnpm/action-setup@v4 - with: - version: 9.12.2 - uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} diff --git a/package.json b/package.json index 26a20aec3..59e378329 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.5.0", "private": true, "description": "Port of tidalcycles to javascript", + "packageManager": "pnpm@10.15.0", "scripts": { "setup": "pnpm i", "pretest": "npm run jsdoc-json", diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index c8be1ac16..936f0cd29 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -4,18 +4,19 @@ packages: - tools/dbpatch - website/ -onlyBuiltDependencies: +catalog: + '@codemirror/autocomplete': ^6.18.4 + '@codemirror/commands': ^6.8.0 + '@codemirror/lang-javascript': ^6.2.2 + '@codemirror/language': ^6.10.8 + '@codemirror/search': ^6.5.8 + '@codemirror/state': ^6.5.1 + '@codemirror/view': ^6.36.2 + +ignoredBuiltDependencies: + - '@serialport/bindings-cpp' + - tree-sitter-haskell + - tree-sitter - esbuild - nx - sharp - - tree-sitter - - tree-sitter-haskell - -catalog: - "@codemirror/commands": "^6.8.0" - "@codemirror/language": "^6.10.8" - "@codemirror/lang-javascript": "^6.2.2" - "@codemirror/state": "^6.5.1" - "@codemirror/view": "^6.36.2" - "@codemirror/autocomplete": "^6.18.4" - "@codemirror/search": "^6.5.8"