Skip to content

Commit 656cd70

Browse files
fix(core): pnpm installation issue (#688)
* Hard pin pnpm version to 5.18.9 * Adding missing version specification
1 parent 3524552 commit 656cd70

File tree

5 files changed

+6
-7
lines changed

5 files changed

+6
-7
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm
31+
npm install -g pnpm@5.18.9
3232
pnpm install --unsafe-perm --frozen-lockfile
3333
- name: Fix nasty bug in CDK
3434
run: |

.github/workflows/lint-prettier.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
${{ runner.OS }}-
2929
- name: Install Node.js modules
3030
run: |
31-
npm install -g pnpm
31+
npm install -g pnpm@5.18.9
3232
pnpm install --frozen-lockfile
3333
- name: Analyze TypeScript files
3434
run: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
node-version: 12
3232
- name: Install pnpm
3333
run: |
34-
npm install -g pnpm
34+
npm install -g pnpm@5.18.9
3535
- name: Generate Changelog
3636
id: changelog
3737
env:

src/installer/cdk/src/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,7 @@ async function main() {
138138
installerProjectRole.addToPrincipalPolicy(
139139
new iam.PolicyStatement({
140140
actions: ['s3:*'],
141-
// resources: [`arn:aws:s3:::${acceleratorPrefix.toLowerCase()}cdktoolkit-stagingbucket-*`],
142-
resources: [`arn:aws:s3:::cdk-${acceleratorPrefix.toLowerCase()}assets-*`],
141+
resources: [`arn:aws:s3:::cdk-*`],
143142
}),
144143
);
145144

@@ -181,7 +180,7 @@ async function main() {
181180
nodejs: 12,
182181
},
183182
// The flag '--unsafe-perm' is necessary to run pnpm scripts in Docker
184-
commands: ['npm install --global pnpm', 'pnpm install --unsafe-perm --frozen-lockfile'],
183+
commands: ['npm install --global pnpm@5.18.9', 'pnpm install --unsafe-perm --frozen-lockfile'],
185184
},
186185
build: {
187186
commands: [

src/lib/cdk-accelerator/src/codebuild/cdk-deploy-project.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ export class PrebuiltCdkDeployProject extends CdkDeployProjectBase {
173173
*/
174174
function installPackageManagerCommands(packageManager: PackageManager) {
175175
if (packageManager === 'pnpm') {
176-
return ['npm install --global pnpm'];
176+
return ['npm install --global pnpm@5.18.9'];
177177
}
178178
throw new Error(`Unknown package manager ${packageManager}`);
179179
}

0 commit comments

Comments
 (0)