From 252c82e3680c39015ed7af7dbfbe9ba68ff2a2d0 Mon Sep 17 00:00:00 2001 From: Tyler Butler Date: Tue, 28 Mar 2023 16:30:34 -0700 Subject: [PATCH] ci: pin pnpm version to 7.30.5 (#14838) Port of #14815 to the tinylicious release branch. --- server/gitrest/Dockerfile | 2 +- server/historian/Dockerfile | 2 +- server/routerlicious/Dockerfile | 2 +- tools/pipelines/build-docs.yml | 2 +- tools/pipelines/repo-policy-check.yml | 2 +- tools/pipelines/templates/build-docker-service.yml | 2 +- tools/pipelines/templates/build-npm-package.yml | 3 ++- tools/pipelines/templates/include-policy-check.yml | 2 +- tools/pipelines/templates/include-set-package-version.yml | 3 ++- tools/pipelines/templates/include-test-stability.yml | 3 ++- 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/server/gitrest/Dockerfile b/server/gitrest/Dockerfile index 737ebc3de12e..17d22d6d27b6 100644 --- a/server/gitrest/Dockerfile +++ b/server/gitrest/Dockerfile @@ -25,7 +25,7 @@ COPY scripts/*.* ./scripts/ COPY packages/gitrest/package*.json packages/gitrest/ COPY packages/gitrest-base/package*.json packages/gitrest-base/ -RUN npm install --global pnpm +RUN npm install --global pnpm@7.30.5 # Need to set the --unsafe-perm flag since we are doing the install as root. Consider adding an 'app' accout so we # can do the install as node but then switch to 'app' to run. As app we won't be able to write to installed files diff --git a/server/historian/Dockerfile b/server/historian/Dockerfile index 7fbc39282f2f..f14fc9af98d0 100644 --- a/server/historian/Dockerfile +++ b/server/historian/Dockerfile @@ -28,7 +28,7 @@ COPY scripts/*.* ./scripts/ COPY packages/historian/package.json packages/historian/ COPY packages/historian-base/package.json packages/historian-base/ -RUN npm install --global pnpm +RUN npm install --global pnpm@7.30.5 # Need to set the --unsafe-perm flag since we are doing the install as root. Consider adding an 'app' accout so we # can do the install as node but then switch to 'app' to run. As app we won't be able to write to installed files diff --git a/server/routerlicious/Dockerfile b/server/routerlicious/Dockerfile index f43f1ca0cc44..5325e19b0eb3 100644 --- a/server/routerlicious/Dockerfile +++ b/server/routerlicious/Dockerfile @@ -50,7 +50,7 @@ COPY packages/services-utils/package*.json packages/services-utils/ COPY packages/test-utils/package*.json packages/test-utils/ COPY packages/protocol-base/package*.json packages/protocol-base/ -RUN npm install --global pnpm +RUN npm install --global pnpm@7.30.5 # Need to set the --unsafe-perm flag since we are doing the install as root. Consider adding an 'app' accout so we # can do the install as node but then switch to 'app' to run. As app we won't be able to write to installed files diff --git a/tools/pipelines/build-docs.yml b/tools/pipelines/build-docs.yml index 05b74e56b2e5..bf78527fb93d 100644 --- a/tools/pipelines/build-docs.yml +++ b/tools/pipelines/build-docs.yml @@ -202,7 +202,7 @@ stages: inputs: targetType: 'inline' script: | - npm i -g pnpm + npm i -g pnpm@7.30.5 pnpm config set store-dir $(pnpmStorePath) - task: Bash@3 diff --git a/tools/pipelines/repo-policy-check.yml b/tools/pipelines/repo-policy-check.yml index 47e2592dcdb7..e07b16a604c6 100644 --- a/tools/pipelines/repo-policy-check.yml +++ b/tools/pipelines/repo-policy-check.yml @@ -45,7 +45,7 @@ steps: inputs: targetType: 'inline' script: | - npm i -g pnpm + npm i -g pnpm@7.30.5 pnpm config set store-dir $(pnpmStorePath) - task: Bash@3 diff --git a/tools/pipelines/templates/build-docker-service.yml b/tools/pipelines/templates/build-docker-service.yml index 59e517216364..656c1b3f3aa6 100644 --- a/tools/pipelines/templates/build-docker-service.yml +++ b/tools/pipelines/templates/build-docker-service.yml @@ -242,7 +242,7 @@ stages: targetType: 'inline' workingDirectory: ${{ parameters.buildDirectory }} script: | - npm i -g pnpm + npm i -g pnpm@7.30.5 pnpm config set store-dir $(pnpmStorePath) # Set version diff --git a/tools/pipelines/templates/build-npm-package.yml b/tools/pipelines/templates/build-npm-package.yml index e2802e49890e..efdd436aee8f 100644 --- a/tools/pipelines/templates/build-npm-package.yml +++ b/tools/pipelines/templates/build-npm-package.yml @@ -255,7 +255,8 @@ stages: targetType: 'inline' workingDirectory: ${{ parameters.buildDirectory }} script: | - npm i -g pnpm + npm i -g pnpm@7.30.5 + pnpm -v pnpm config set store-dir $(pnpmStorePath) - task: Bash@3 diff --git a/tools/pipelines/templates/include-policy-check.yml b/tools/pipelines/templates/include-policy-check.yml index d3d5fa68a58f..41b61ed345c6 100644 --- a/tools/pipelines/templates/include-policy-check.yml +++ b/tools/pipelines/templates/include-policy-check.yml @@ -41,7 +41,7 @@ stages: workingDirectory: ${{ parameters.buildDirectory }} script: | # Install pnpm globally - npm i -g pnpm + npm i -g pnpm@7.30.5 # We only want to install the root package deps, so we set recursive-install to false pnpm config set recursive-install false diff --git a/tools/pipelines/templates/include-set-package-version.yml b/tools/pipelines/templates/include-set-package-version.yml index 05468254c4bb..84fef0b98291 100644 --- a/tools/pipelines/templates/include-set-package-version.yml +++ b/tools/pipelines/templates/include-set-package-version.yml @@ -44,7 +44,8 @@ steps: workingDirectory: ${{ parameters.buildDirectory }} script: | pushd "$(Build.SourcesDirectory)/build-tools" - npm i -g pnpm + npm i -g pnpm@7.30.5 + pnpm -v pnpm config set store-dir $(pnpmStorePath) pnpm i pnpm build:compile diff --git a/tools/pipelines/templates/include-test-stability.yml b/tools/pipelines/templates/include-test-stability.yml index 11988b54cd39..ed4bab9e25b6 100644 --- a/tools/pipelines/templates/include-test-stability.yml +++ b/tools/pipelines/templates/include-test-stability.yml @@ -84,7 +84,8 @@ jobs: targetType: 'inline' workingDirectory: ${{ parameters.buildDirectory }} script: | - npm i -g pnpm + npm i -g pnpm@7.30.5 + pnpm -v pnpm config set store-dir $(pnpmStorePath) - task: Bash@3