Skip to content

Commit c101e3c

Browse files
authored
feat(ci): upload test results for make commands that use nextest (#24680)
* feat(ci): upload test results for make commands that produce nextest artifacts * delete cli.yml and use .github/workflows/test-make-command.yml * remove stuff claude missed * we probably should not upload for comment triggers
1 parent 68609df commit c101e3c

5 files changed

Lines changed: 19 additions & 40 deletions

File tree

.github/workflows/changes.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ on:
5252
value: ${{ jobs.source.outputs.test-yml }}
5353
integration-yml:
5454
value: ${{ jobs.source.outputs.integration-yml }}
55-
cli-yml:
56-
value: ${{ jobs.source.outputs.cli-yml }}
5755
test-make-command-yml:
5856
value: ${{ jobs.source.outputs.test-make-command-yml }}
5957
msrv-yml:
@@ -175,7 +173,6 @@ jobs:
175173
website_only: ${{ steps.filter.outputs.website == 'true' && steps.filter.outputs.not_website == 'false' }}
176174
test-yml: ${{ steps.filter.outputs.test-yml }}
177175
integration-yml: ${{ steps.filter.outputs.integration-yml }}
178-
cli-yml: ${{ steps.filter.outputs.cli-yml }}
179176
test-make-command-yml: ${{ steps.filter.outputs.test-make-command-yml }}
180177
msrv-yml: ${{ steps.filter.outputs.msrv-yml }}
181178
cross-yml: ${{ steps.filter.outputs.cross-yml }}
@@ -265,9 +262,6 @@ jobs:
265262
integration-yml:
266263
- ".github/workflows/integration.yml"
267264
- ".github/workflows/changes.yml"
268-
cli-yml:
269-
- ".github/workflows/cli.yml"
270-
- ".github/workflows/changes.yml"
271265
test-make-command-yml:
272266
- ".github/workflows/test-make-command.yml"
273267
- ".github/workflows/changes.yml"

.github/workflows/ci-review-trigger.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,11 @@ jobs:
8686

8787
cli:
8888
if: startsWith(github.event.review.body, '/ci-run-all') || contains(github.event.review.body, '/ci-run-cli')
89-
uses: ./.github/workflows/cli.yml
89+
uses: ./.github/workflows/test-make-command.yml
9090
with:
9191
ref: ${{ github.event.review.commit_id }}
92+
command: test-cli
93+
job_name: CLI tests
9294
secrets: inherit
9395

9496
make-test-behavior:

.github/workflows/cli.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/master_merge_queue.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@ jobs:
4747
secrets: inherit
4848

4949
test-cli:
50-
if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.cli-yml == 'true' }}
51-
uses: ./.github/workflows/cli.yml
50+
if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.test-make-command-yml == 'true' }}
51+
uses: ./.github/workflows/test-make-command.yml
52+
with:
53+
command: test-cli
54+
job_name: CLI tests
55+
upload_test_results: true
5256
needs: changes
5357
secrets: inherit
5458

.github/workflows/test-make-command.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ on:
1515
description: 'Git ref to checkout'
1616
required: false
1717
type: string
18+
upload_test_results:
19+
description: 'Whether to upload nextest test results (for commands that use cargo nextest)'
20+
required: false
21+
type: boolean
22+
default: false
1823

1924

2025
permissions:
@@ -37,4 +42,9 @@ jobs:
3742
rust: true
3843
protoc: true
3944
libsasl2: true
45+
cargo-nextest: ${{ inputs.upload_test_results }}
46+
datadog-ci: ${{ inputs.upload_test_results }}
4047
- run: make ${{ inputs.command }}
48+
- name: Upload test results
49+
run: scripts/upload-test-results.sh
50+
if: ${{ always() && inputs.upload_test_results }}

0 commit comments

Comments
 (0)