Merge branch 'main' into fix/shutdown-agents-after-dte

nrwl · Nov 17, 2023 · 62ff3fa · 62ff3fa
2 parents fa2214e + b65f0cb
commit 62ff3fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/nx-cloud-agents.yml b/.github/workflows/nx-cloud-agents.yml
@@ -105,7 +105,7 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: ${{ inputs.pnpm-version }}
-          package_json_file: "${{ inputs.working-directory || github.workspace }}/package.json"
+          package_json_file: "${{ inputs.working-directory && format('{0}/package.json', inputs.working-directory) || 'package.json' }}"
 
       - name: Print node/npm/yarn versions
         id: versions

diff --git a/.github/workflows/nx-cloud-main.yml b/.github/workflows/nx-cloud-main.yml
@@ -129,7 +129,7 @@ jobs:
         uses: pnpm/action-setup@v2
         with:
           version: ${{ inputs.pnpm-version }}
-          package_json_file: "${{ inputs.working-directory || github.workspace }}/package.json"
+          package_json_file: "${{ inputs.working-directory && format('{0}/package.json', inputs.working-directory) || 'package.json' }}"
 
       - name: Print node/npm/yarn versions
         id: versions