Skip to content

Commit 65df966

Browse files
Use pinned packageManager
1 parent 9415729 commit 65df966

4 files changed

Lines changed: 11 additions & 5 deletions

File tree

eng/common/pipelines/ci.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@ extends:
3232

3333
- template: /eng/common/pipelines/templates/steps/create-authenticated-npmrc.yml
3434

35-
- script: npm install -g pnpm@10.30.2 # Pnpm manage-package-manager-versions will respect packageManager field
35+
- pwsh: |
36+
$packageJson = Get-Content -Raw "$(Build.SourcesDirectory)/package.json" | ConvertFrom-Json
37+
npm install -g $packageJson.packageManager # Pnpm manage-package-manager-versions will respect packageManager field
3638
displayName: Install pnpm
3739
3840
- script: pnpm install
39-
displayName: Install JavaScript Dependencies
41+
displayName: Install Java`Script Dependencies
4042

4143
- script: node $(Build.SourcesDirectory)/eng/common/scripts/resolve-target-branch.js
4244
displayName: Resolve target branch

eng/tsp-core/pipelines/templates/install.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ steps:
2626

2727
- template: /eng/common/pipelines/templates/steps/create-authenticated-npmrc.yml
2828

29-
- script: npm install -g pnpm@10.30.2 # Pnpm manage-package-manager-versions will respect packageManager field
29+
- pwsh: |
30+
$packageJson = Get-Content -Raw "$(Build.SourcesDirectory)/package.json" | ConvertFrom-Json
31+
npm install -g $packageJson.packageManager # Pnpm manage-package-manager-versions will respect packageManager field
3032
displayName: Install pnpm
3133
3234
- script: pnpm config set store-dir ${{ parameters.pnpmStorePath }}

packages/http-client-csharp/eng/scripts/Test-Packages.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ try {
3636
if ($GenerationChecks) {
3737
Set-StrictMode -Version 1
3838

39+
$packageJson = Get-Content -Raw "../../../../../package.json" | ConvertFrom-Json
40+
3941
Write-Host "Installing pnpm" -ForegroundColor Cyan
40-
Invoke-LoggedCommand "npm install -g pnpm@10.30.2" -GroupOutput
42+
Invoke-LoggedCommand "npm install -g $($packageJson.packageManager)" -GroupOutput
4143

4244
Write-Host "Setting up workspace" -ForegroundColor Cyan
4345
Invoke-LoggedCommand "pnpm setup:min" $packageRoot/../..

pnpm-workspace.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ catalog:
144144
rimraf: ^6.1.3
145145
rollup-plugin-visualizer: 7.0.1
146146
semver: ^7.7.4
147-
sharp: ^0.35.1
147+
sharp: ^0.35.2
148148
simple-git: ^3.36.0
149149
source-map-support: ^0.5.21
150150
storybook: ^10.3.5

0 commit comments

Comments
 (0)