Skip to content

Commit 86852c5

Browse files
HyukjinKwondongjoon-hyun
authored andcommitted
[SPARK-32606][SPARK-32605][INFRA] Remove the forks of action-surefire-report and action-download-artifact in test_report.yml
### What changes were proposed in this pull request? This PR proposes to remove the usage of my own forks and use the original plugins in GitHub Actions testing report. SPARK-32357 introduced the GitHub Actions test reporting by leveraging two plugins: - [ScaCap/action-surefire-report](https://github.com/ScaCap/action-surefire-report) - [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) In order to make it working, it had to fork two repositories with custom fixes: - HyukjinKwon/action-surefire-reportc96094c - HyukjinKwon/action-download-artifact@f86c565 The two custom fixes are thankfully merged at ScaCap/action-surefire-report#14 and dawidd6/action-download-artifact#24, and they released new ones to use at [ScaCap/action-surefire-report/commits/v1](https://github.com/ScaCap/action-surefire-report/commits/v1) and [dawidd6/action-download-artifact/commits/v2](https://github.com/dawidd6/action-download-artifact/commits/v2) - thanks jmisur and dawidd6 again. ### Why are the changes needed? To avoid relying on forks and code duplications. ### Does this PR introduce _any_ user-facing change? No, dev-only. ### How was this patch tested? Logically there is no diff. I tested it at https://github.com/HyukjinKwon/spark/runs/992824229 for doubly sure. NOTE that this PR cannot be tested here within the workflow triggered by this PR without merging the changes in `test_report.yml` into the master. Closes #29449 from HyukjinKwon/SPARK-32606-SPARK-32605. Authored-by: HyukjinKwon <gurwls223@apache.org> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 108b1dc commit 86852c5

File tree

1 file changed

+3
-14
lines changed

1 file changed

+3
-14
lines changed

.github/workflows/test_report.yml

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Download test results to report
13-
# TODO(SPARK-32605): It was forked to have a custom fix
14-
# https://github.com/HyukjinKwon/action-surefire-report/commit/c96094cc35061fcf154a7cb46807f2f3e2339476
15-
# in order to add the support of custom target commit SHA. It should be contributed back to the original
16-
# plugin and avoid using the fork.
17-
uses: HyukjinKwon/action-download-artifact@master
13+
uses: dawidd6/action-download-artifact@v2
1814
with:
1915
github_token: ${{ secrets.GITHUB_TOKEN }}
2016
workflow: ${{ github.event.workflow_run.workflow_id }}
2117
commit: ${{ github.event.workflow_run.head_commit.id }}
2218
- name: Publish test report
23-
# TODO(SPARK-32606): It was forked to have a custom fix
24-
# https://github.com/HyukjinKwon/action-download-artifact/commit/750b71af351aba467757d7be6924199bb08db4ed
25-
# in order to add the support to download all artifacts. It should be contributed back to the original
26-
# plugin and avoid using the fork.
27-
# Alternatively, we can use the official actions/download-artifact once they support to download artifacts
28-
# between different workloads, see also https://github.com/actions/download-artifact/issues/3
29-
uses: HyukjinKwon/action-surefire-report@master
19+
uses: scacap/action-surefire-report@v1
3020
with:
31-
check_name: Test report
21+
check_name: Report test results
3222
github_token: ${{ secrets.GITHUB_TOKEN }}
3323
report_paths: "**/target/test-reports/*.xml"
3424
commit: ${{ github.event.workflow_run.head_commit.id }}
35-

0 commit comments

Comments
 (0)