Skip to content

fix: auto-derive cache-dependency-path from packageManager input #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WillieRuemmele wants to merge 1 commit into from
Closed

fix: auto-derive cache-dependency-path from packageManager input #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ctcClose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ on:
default: '10'
required: false
cache-dependency-path:
description: Path to the calling repository's package manager lockfile
description: Path to the calling repository's package manager lockfile; auto-derived from package-manager if not set
type: string
default: package-lock.json
default: ''
required: false

jobs:
Expand All @@ -47,7 +47,7 @@ jobs:
with:
node-version: ${{ inputs.nodeVersion }}
cache: ${{ inputs.package-manager }}
cache-dependency-path: ${{ inputs.cache-dependency-path }}
cache-dependency-path: ${{ inputs.cache-dependency-path || (inputs.package-manager == 'yarn' && 'yarn.lock' || (inputs.package-manager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}
- run: npm install -g @salesforce/change-case-management --omit=dev
- id: ctc
run: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ctcOpen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ on:
default: '10'
required: false
cache-dependency-path:
description: Path to the calling repository's package manager lockfile
description: Path to the calling repository's package manager lockfile; auto-derived from package-manager if not set
type: string
default: package-lock.json
default: ''
required: false
outputs:
changeCaseId:
Expand All @@ -47,7 +47,7 @@ jobs:
with:
node-version: ${{ inputs.nodeVersion }}
cache: ${{ inputs.package-manager }}
cache-dependency-path: ${{ inputs.cache-dependency-path }}
cache-dependency-path: ${{ inputs.cache-dependency-path || (inputs.package-manager == 'yarn' && 'yarn.lock' || (inputs.package-manager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}

- run: npm install -g @salesforce/change-case-management --omit=dev

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/npmPublish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ on:
default: '10'
type: string
cacheDependencyPath:
description: path to the package manager lockfile; defaults to yarn.lock, so npm and pnpm callers must override it
description: path to the package manager lockfile; auto-derived from packageManager if not set
required: false
default: yarn.lock
default: ''
type: string
vulnerabilityCheck:
description: if true, checks for known vulnerable package versions
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
nodeVersion: ${{ inputs.nodeVersion }}
package-manager: ${{ inputs.packageManager }}
package-manager-version: ${{ inputs.packageManagerVersion }}
cache-dependency-path: ${{ inputs.cacheDependencyPath }}
cache-dependency-path: ${{ inputs.cacheDependencyPath || (inputs.packageManager == 'yarn' && 'yarn.lock' || (inputs.packageManager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}
secrets: inherit

npm-publish:
Expand All @@ -158,7 +158,7 @@ jobs:
with:
node-version: ${{ inputs.nodeVersion }}
cache: ${{ inputs.packageManager }}
cache-dependency-path: ${{ inputs.cacheDependencyPath }}
cache-dependency-path: ${{ inputs.cacheDependencyPath || (inputs.packageManager == 'yarn' && 'yarn.lock' || (inputs.packageManager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}
- name: Install dependencies with yarn
if: inputs.packageManager == 'yarn'
uses: salesforcecli/github-workflows/.github/actions/yarnInstallWithRetries@ph/W-23832274-pnpm-stable-promotion
Expand Down Expand Up @@ -231,7 +231,7 @@ jobs:
nodeVersion: ${{ inputs.nodeVersion }}
package-manager: ${{ inputs.packageManager }}
package-manager-version: ${{ inputs.packageManagerVersion }}
cache-dependency-path: ${{ inputs.cacheDependencyPath }}
cache-dependency-path: ${{ inputs.cacheDependencyPath || (inputs.packageManager == 'yarn' && 'yarn.lock' || (inputs.packageManager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}

ctcCloseFail:
needs: [ctc-open, npm-publish]
Expand All @@ -244,4 +244,4 @@ jobs:
status: Not Implemented
package-manager: ${{ inputs.packageManager }}
package-manager-version: ${{ inputs.packageManagerVersion }}
cache-dependency-path: ${{ inputs.cacheDependencyPath }}
cache-dependency-path: ${{ inputs.cacheDependencyPath || (inputs.packageManager == 'yarn' && 'yarn.lock' || (inputs.packageManager == 'pnpm' && 'pnpm-lock.yaml' || 'package-lock.json')) }}