Skip to content

Commit a49209d

Browse files
authored
Merge pull request #36 from gynzy/pf-3332-migrate-to-pnpm-11
chore: migrate to pnpm 11
2 parents b655567 + cefe0e0 commit a49209d

11 files changed

Lines changed: 51 additions & 21 deletions

File tree

.github/jsonnet/GIT_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5985c99fa9e401a6a47e10cd49e141524cf63d4d
1+
12cd23dc5e40255f190d7d2aebabfaaebc639b41

.github/jsonnet/actions.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* human-readable version that the SHA corresponds to at the time of pinning.
88
*/
99
{
10-
checkout_action: 'actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd', // v6
10+
checkout_action: 'actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0', // v7
1111
gcp_auth_action: 'google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093', // v3
1212
gcp_setup_gcloud_action: 'google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db', // v3
1313
pulumi_action: 'pulumi/actions@cd99a7f8865434dd3532b586a26f9ebea596894f', // v5

.github/jsonnet/pnpm.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ local yarn = import 'yarn.jsonnet';
2020
install(args=[], with={}, prod=false, storeDir=null, ifClause=null, workingDirectory=null)::
2121
base.action(
2222
'Install pnpm tool',
23-
'pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320', // v5
23+
'pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271', // v6.0.9
2424
with=with + if workingDirectory != null then {
2525
package_json_file: workingDirectory + '/package.json'
2626
} else {},

.github/jsonnet/pulumi.jsonnet

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ local pulumiDefaultEnvironment(stack) = {
156156
* @param {array} [additionalSetupSteps=[]] - Extra setup steps before Pulumi preview
157157
* @param {boolean} [ignoreEngines=false] - Whether to ignore Node.js engine requirements
158158
* @param {string} [runsOn=null] - GitHub Actions runner to use for the job
159+
* @param {string} [packageManager='yarn'] - Package manager to use ('yarn' or 'pnpm')
160+
* @param {array} [pnpmInstallArgs=[]] - Additional arguments for pnpm install
159161
* @param {boolean} [blobless=null] - Whether to perform a blobless clone (--filter=blob:none); null uses checkout default
160162
* @param {number} [retryAttempts=null] - Number of additional checkout attempts on failure; null uses checkout default
161163
* @param {number} [cloneTimeout=null] - Timeout for git clone operation in minutes; null uses checkout default
@@ -175,14 +177,22 @@ local pulumiDefaultEnvironment(stack) = {
175177
ignoreEngines=false,
176178
runsOn=null,
177179
pulumiVersion=defaultPulumiVersion,
180+
packageManager='yarn',
181+
pnpmInstallArgs=[],
182+
blobless=null,
183+
retryAttempts=null,
184+
cloneTimeout=null,
178185
)::
179186
base.ghJob(
180187
'pulumi-preview-' + stack,
181188
runsOn=runsOn,
182189
image=image,
183190
useCredentials=false,
184191
steps=[
185-
yarn.checkoutAndYarn(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, ignoreEngines=ignoreEngines),
192+
(
193+
if packageManager == 'yarn' then yarn.checkoutAndYarn(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, ignoreEngines=ignoreEngines, blobless=blobless, retryAttempts=retryAttempts, cloneTimeout=cloneTimeout)
194+
else if packageManager == 'pnpm' then pnpm.checkoutAndPnpm(ref=gitCloneRef, cacheName=cacheName, fullClone=false, workingDirectory=yarnDir, source=yarnNpmSource, pnpmInstallArgs=pnpmInstallArgs, blobless=blobless, retryAttempts=retryAttempts, cloneTimeout=cloneTimeout)
195+
),
186196
pulumiSetupSteps(pulumiVersion),
187197
additionalSetupSteps,
188198
self.pulumiPreview(stack, pulumiDir=pulumiDir, environmentVariables=environmentVariables),
@@ -201,6 +211,13 @@ local pulumiDefaultEnvironment(stack) = {
201211
* @param {string} [image=images.default_pulumi_node_image] - Container image
202212
* @param {object} [environmentVariables={}] - Additional environment variables
203213
* @param {array} [additionalSetupSteps=[]] - Extra setup steps
214+
* @param {string} [packageManager='yarn'] - Package manager to use ('yarn' or 'pnpm')
215+
* @param {array} [pnpmInstallArgs=[]] - Additional arguments for pnpm install
216+
* @param {boolean} [ignoreEngines=false] - Whether to ignore Node.js engine requirements
217+
* @param {string} [runsOn=null] - GitHub Actions runner to use for the job
218+
* @param {boolean} [blobless=null] - Whether to perform a blobless clone (--filter=blob:none); null uses checkout default
219+
* @param {number} [retryAttempts=null] - Number of additional checkout attempts on failure; null uses checkout default
220+
* @param {number} [cloneTimeout=null] - Timeout for git clone operation in minutes; null uses checkout default
204221
* @param {string} [pulumiVersion=defaultPulumiVersion] - Pulumi CLI version to install
205222
* @returns {jobs} - GitHub Actions job for test environment Pulumi preview
206223
*/
@@ -215,6 +232,13 @@ local pulumiDefaultEnvironment(stack) = {
215232
environmentVariables={},
216233
additionalSetupSteps=[],
217234
pulumiVersion=defaultPulumiVersion,
235+
packageManager='yarn',
236+
pnpmInstallArgs=[],
237+
ignoreEngines=false,
238+
runsOn=null,
239+
blobless=null,
240+
retryAttempts=null,
241+
cloneTimeout=null,
218242
)::
219243
self.pulumiPreviewJob(
220244
stack,
@@ -227,6 +251,13 @@ local pulumiDefaultEnvironment(stack) = {
227251
environmentVariables=environmentVariables,
228252
additionalSetupSteps=additionalSetupSteps,
229253
pulumiVersion=pulumiVersion,
254+
packageManager=packageManager,
255+
pnpmInstallArgs=pnpmInstallArgs,
256+
ignoreEngines=ignoreEngines,
257+
runsOn=runsOn,
258+
blobless=blobless,
259+
retryAttempts=retryAttempts,
260+
cloneTimeout=cloneTimeout,
230261
),
231262

232263
/**

.github/jsonnet/yarn.jsonnet

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ local misc = import 'misc.jsonnet';
4848
cat <<EOF > .npmrc
4949
@gynzy:registry=https://npm.gynzy.net/
5050
"//npm.gynzy.net/:_authToken"="${NPM_TOKEN}"
51-
public-hoist-pattern[]=@pulumi/pulumi
5251
EOF
5352
|||,
5453
env={
@@ -74,7 +73,6 @@ local misc = import 'misc.jsonnet';
7473
cat <<EOF > .npmrc
7574
@gynzy:registry=https://npm.pkg.github.com
7675
//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}
77-
public-hoist-pattern[]=@pulumi/pulumi
7876
EOF
7977
|||,
8078
env={

.github/workflows/misc.yml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/pr.yml

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/publish-prod.yml

Lines changed: 3 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@gynzy/ember-sortable",
3-
"version": "4.0.14",
4-
"packageManager": "pnpm@10.33.4",
3+
"version": "4.0.15",
4+
"packageManager": "pnpm@11.13.0",
55
"description": "Sortable UI primitives for Ember.",
66
"keywords": [
77
"ember-addon",

0 commit comments

Comments
 (0)