From 91b80274419bd60a4c18dcddff68fc74b384fcd8 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 22 Feb 2023 17:50:20 +0200 Subject: [PATCH] ci: use pnpm v8 (#6116) --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 2 +- fetching/git-fetcher/test/index.ts | 2 +- pkg-manager/core/test/install/lifecycleScripts.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8fc602845..07395910c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,7 +33,7 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2.2.4 with: - version: next-7 + version: next-8 - name: Setup Node uses: actions/setup-node@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 33bfd0d206..b8cbf44e1b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,7 +30,7 @@ jobs: sudo mv ldid /usr/local/bin - name: install pnpm and npm run: | - curl -L https://get.pnpm.io/v6.16.js | node - add --global pnpm@next-7 npm@7 + curl -L https://get.pnpm.io/v6.16.js | node - add --global pnpm@next-8 npm@7 - name: pnpm install run: pnpm install - name: Publish Packages diff --git a/fetching/git-fetcher/test/index.ts b/fetching/git-fetcher/test/index.ts index 177f052fee..2e196f9864 100644 --- a/fetching/git-fetcher/test/index.ts +++ b/fetching/git-fetcher/test/index.ts @@ -58,7 +58,7 @@ test('fetch a package from Git that has a prepare script', async () => { const { filesIndex } = await fetch( createCafsStore(cafsDir), { - commit: 'd2916cab494f6cddc85c921ffa3befb600e00e0e', + commit: 'd222f6bfbdea55c032fdb5f0538d52b2a484bbbf', repo: 'https://github.com/pnpm/test-git-fetch.git', type: 'git', }, diff --git a/pkg-manager/core/test/install/lifecycleScripts.ts b/pkg-manager/core/test/install/lifecycleScripts.ts index b16fb0f8e7..1eb18c44c6 100644 --- a/pkg-manager/core/test/install/lifecycleScripts.ts +++ b/pkg-manager/core/test/install/lifecycleScripts.ts @@ -270,7 +270,7 @@ test('run lifecycle scripts of dependent packages after running scripts of their test('run prepare script for git-hosted dependencies', async () => { const project = prepareEmpty() - await addDependenciesToPackage({}, ['pnpm/test-git-fetch#299c6d89507571462b992b92407a8a07663e32ee'], await testDefaults({ fastUnpack: false })) + await addDependenciesToPackage({}, ['pnpm/test-git-fetch#d222f6bfbdea55c032fdb5f0538d52b2a484bbbf'], await testDefaults({ fastUnpack: false })) const scripts = project.requireModule('test-git-fetch/output.json') expect(scripts).toStrictEqual([ @@ -285,7 +285,7 @@ test('run prepare script for git-hosted dependencies', async () => { ]) const lockfile = await project.readLockfile() - expect(lockfile.packages['github.com/pnpm/test-git-fetch/299c6d89507571462b992b92407a8a07663e32ee'].prepare === true).toBeTruthy() + expect(lockfile.packages['github.com/pnpm/test-git-fetch/d222f6bfbdea55c032fdb5f0538d52b2a484bbbf'].prepare === true).toBeTruthy() }) test('lifecycle scripts run before linking bins', async () => {