Skip to content

Commit 35b8fed

Browse files
committed
Use single artifact for PR number and merge test results
1 parent c8bd9e2 commit 35b8fed

File tree

2 files changed

+22
-19
lines changed

2 files changed

+22
-19
lines changed

.github/workflows/build.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -70,19 +70,6 @@ jobs:
7070
path: junit.xml
7171
if-no-files-found: error
7272
retention-days: 1
73-
- name: Get PR number
74-
id: get-pr-data
75-
if: github.event_name == 'pull_request'
76-
run: |
77-
echo "${{ github.event.number }}" > "pr-number.txt"
78-
echo "${{ matrix.runner }}" > "pr-runner.txt"
79-
echo "${{ matrix.node }}" > "pr-node.txt"
80-
- name: Upload PR number
81-
uses: actions/upload-artifact@v4
82-
if: github.event_name == 'pull_request'
83-
with:
84-
name: pr-data-${{ matrix.runner }}-${{ matrix.node }}
85-
path: "pr-*.txt"
8673

8774
build_s390x:
8875
name: Build s390x
@@ -207,6 +194,22 @@ jobs:
207194
- run: ./test-driver.sh
208195
name: Verify install
209196

197+
upload_pr_number:
198+
name: Upload PR number
199+
runs-on: ubuntu-latest
200+
steps:
201+
- name: Get PR number
202+
id: get-pr-number
203+
if: github.event_name == 'pull_request'
204+
run: |
205+
echo "${{ github.event.number }}" > "pr-number.txt"
206+
- name: Upload PR number
207+
uses: actions/upload-artifact@v4
208+
if: github.event_name == 'pull_request'
209+
with:
210+
name: pr-number
211+
path: "pr-number.txt"
212+
210213
publish:
211214
permissions:
212215
contents: read

.github/workflows/pr-update-comment.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ jobs:
2323
- name: Download PR number
2424
uses: actions/download-artifact@v4
2525
with:
26+
name: pr-number
2627
github-token: ${{ github.token }}
2728
run-id: ${{ github.event.workflow_run.id }}
2829
- name: Display downloaded files
2930
run: ls -R
3031
- name: Set PR number
31-
id: get-pr-data
32+
id: get-pr-number
3233
run: |
3334
echo "pr-number=$(cat pr-number.txt)" >> "${GITHUB_OUTPUT}"
34-
echo "pr-runner=$(cat pr-runner.txt)" >> "${GITHUB_OUTPUT}"
35-
echo "pr-node=$(cat pr-node.txt)" >> "${GITHUB_OUTPUT}"
3635
- name: Publish reports
3736
uses: turing85/publish-report@v2
3837
with:
39-
comment-message-pr-number: ${{ steps.get-pr-data.outputs.pr-number }}
40-
download-artifact-name: test-report-${{ steps.get-pr-data.outputs.pr-runner }}-${{ steps.get-pr-data.outputs.pr-node }}
38+
comment-message-pr-number: ${{ steps.get-pr-number.outputs.pr-number }}
39+
download-artifact-pattern: test-report-*
40+
download-artifact-merge-multiple: true
4141
download-artifact-run-id: ${{ github.event.workflow_run.id }}
4242
comment-header: my-comment-header
4343
comment-message-success: |
@@ -54,6 +54,6 @@ jobs:
5454
5555
The report can be found [here]({4}).
5656
report-fail-on-error: true
57-
report-name: Tests ${{ steps.get-pr-data.outputs.pr-runner-node }}
57+
report-name: Tests
5858
report-path: junit.xml
5959
report-reporter: jest-junit

0 commit comments

Comments
 (0)