Skip to content

Commit

Permalink
fix: ensure proper path for pnpm package.json (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
meeroslav committed Nov 17, 2023
1 parent 40ef06c commit b65f0cb
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nx-cloud-agents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nx-cloud-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
```
Expand Down Expand Up @@ -109,15 +109,15 @@ 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 }}
with: ...

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 }}
Expand All @@ -133,7 +133,7 @@ See the annotated configuration below for all explicitly supported secret values
<!-- start configuration-options-for-the-main-job -->

```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
Expand Down Expand Up @@ -258,7 +258,7 @@ See the annotated configuration below for all explicitly supported secret values
<!-- start configuration-options-for-agent-jobs -->

```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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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"
}

0 comments on commit b65f0cb

Please sign in to comment.