From b65f0cbb5b7abc7ea8810e5a6a600c1872655c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Jona=C5=A1?= Date: Fri, 17 Nov 2023 15:31:18 +0100 Subject: [PATCH] fix: ensure proper path for pnpm package.json (#94) --- .github/workflows/nx-cloud-agents.yml | 2 +- .github/workflows/nx-cloud-main.yml | 2 +- README.md | 12 ++++++------ package.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/nx-cloud-agents.yml b/.github/workflows/nx-cloud-agents.yml index e2747f7..5971e4f 100644 --- 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 index a9ac3a5..f652bea 100644 --- 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 diff --git a/README.md b/README.md index 6405990..08dee3e 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ concurrency: jobs: main: name: Nx Cloud - Main Job - uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0 + uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.2 with: # NOTE: Here we are using the special `nx-cloud record` command to ensure that any commands we run that do not go through the cloud task runner natively # (i.e. anything that starts with `nx run`/`nx run-many`/`nx affected --target`), are still captured in the Nx Cloud UI and Github App comment for @@ -74,7 +74,7 @@ jobs: agents: name: Nx Cloud - Agents - uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0 + uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.2 with: number-of-agents: 3 ``` @@ -109,7 +109,7 @@ concurrency: jobs: main: name: Nx Cloud - Main Job - uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0 + uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.2 secrets: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }} @@ -117,7 +117,7 @@ jobs: agents: name: Nx Cloud - Agents - uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0 + uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.2 secrets: NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }} NX_CLOUD_AUTH_TOKEN: ${{ secrets.NX_CLOUD_AUTH_TOKEN }} @@ -133,7 +133,7 @@ See the annotated configuration below for all explicitly supported secret values ```yaml -- uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0 +- uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.2 # [OPTIONAL] Explicitly supported secret values which can be passed into the workflow from your outer workflow run. # # NOTE: You cannot access values from ${{ secrets }} beyond what is explicitly specified here because of the limitations of reusable Github workflows @@ -258,7 +258,7 @@ See the annotated configuration below for all explicitly supported secret values ```yaml -- uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0 +- uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.2 # [OPTIONAL] Explicitly supported secret values which can be passed into the workflow from your outer workflow run. # # NOTE: You cannot access values from ${{ secrets }} beyond what is explicitly specified here because of the limitations of reusable Github workflows diff --git a/package.json b/package.json index 2d066d1..ee5e697 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "private": true, - "version": "0.13.1", + "version": "0.13.2", "description": "This package.json is here purely to control the version of the Action, in combination with https://github.com/JamesHenry/publish-shell-action" }