Skip to content

Commit 055560f

Browse files
Revert "feat: enable npm caching for datadog-ci dependency (#37)" (#39)
This reverts commit a0226c9.
1 parent a0226c9 commit 055560f

7 files changed

Lines changed: 5 additions & 3681 deletions

File tree

.github/dependabot.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@ updates:
33
- package-ecosystem: github-actions
44
directory: /
55
schedule:
6-
interval: weekly
7-
8-
- package-ecosystem: npm
9-
directory: /
10-
schedule:
11-
interval: daily
6+
interval: weekly

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
.idea/
2-
node_modules/

.npmrc

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,5 @@ The action has the following options:
3838
| `service` | Service name to use with the uploaded test results. | False | |
3939
| `env` | Optional environment to add to the tests | False | |
4040
| `logs` | When set to "true" enables forwarding content from the XML reports as Logs. The content inside `<system-out>`, `<system-err>`, and `<failure>` is collected as logs. Logs from elements inside a `<testcase>` are automatically connected to the test. | False | |
41-
| `datadog-ci-version` | Override the @datadog/datadog-ci version. Leave empty to use the bundled version. | False | |
41+
| `datadog-ci-version` | Optionally pin the @datadog/datadog-ci version. | False | `latest` |
4242
| `extra-args` | Extra args to be passed to the datadog-ci junit upload command. | False | |

action.yaml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,42 +42,24 @@ inputs:
4242
description: Set to "true" to enable forwarding content from XML reports as logs.
4343
datadog-ci-version:
4444
required: false
45-
description: The version of the @datadog/datadog-ci package to use. Leave empty to use the bundled version from package.json (recommended for caching).
45+
description: The version of the @datadog/datadog-ci package to use. It defaults to the latest release (`latest`).
46+
default: "latest"
4647
extra-args:
4748
default: ""
4849
description: Extra args to be passed to the datadog-ci cli.
4950
required: false
5051
runs:
5152
using: "composite"
5253
steps:
53-
- name: Resolve action path
54-
id: action-path
55-
shell: bash
56-
run: echo "path=$(cd "${{ github.action_path }}" && pwd)" >> "$GITHUB_OUTPUT"
57-
5854
- name: Install node
5955
uses: actions/setup-node@v4
6056
with:
6157
node-version: ${{ inputs.node-version }}
62-
cache: npm
63-
cache-dependency-path: ${{ steps.action-path.outputs.path }}/package-lock.json
64-
65-
- name: Install datadog-ci (bundled version)
66-
if: inputs.datadog-ci-version == ''
67-
shell: bash
68-
working-directory: ${{ github.action_path }}
69-
run: npm ci
7058

7159
- name: Upload the JUnit files
7260
shell: bash
7361
run: |
74-
if [ -n "${{ inputs.datadog-ci-version }}" ]; then
75-
DATADOG_CI="npx @datadog/datadog-ci@${{ inputs.datadog-ci-version }}"
76-
else
77-
DATADOG_CI="${{ github.action_path }}/node_modules/.bin/datadog-ci"
78-
fi
79-
80-
$DATADOG_CI junit upload \
62+
npx @datadog/datadog-ci@${{ inputs.datadog-ci-version}} junit upload \
8163
--max-concurrency ${{ inputs.concurrency }} \
8264
${{ inputs.logs == 'true' && '--logs' || '' }} \
8365
${{ inputs.auto-discovery == 'true' && '--auto-discovery' || '' }} \

0 commit comments

Comments
 (0)