From 18604bd4fc282b60eae9e45c3ab1e6ad9f221373 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Mon, 11 Dec 2023 17:24:06 -0500 Subject: [PATCH 1/5] cleanup copypasta and rearrange Signed-off-by: Justin Florentine --- .github/workflows/reference-tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index 5e9005c49df..319cdc685d9 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -50,19 +50,19 @@ jobs: with: distribution: adopt java-version: 17 - - name: get acceptance test report + - name: retrieve generated tests + uses: dawidd6/action-download-artifact@v2 + with: + name: reference-tests + - name: get reference test report uses: dawidd6/action-download-artifact@v2 with: branch: main - name: acceptance-test-results + name: reference-test-results path: tmp/ref-xml-reports-downloaded if_no_artifact_found: true - name: setup gradle uses: gradle/gradle-build-action@v2 - - name: retrieve generated tests - uses: dawidd6/action-download-artifact@v2 - with: - name: reference-tests - name: Split tests id: split-tests uses: r7kamura/split-tests-by-timings@v0 @@ -83,6 +83,6 @@ jobs: uses: actions/upload-artifact@v3 if: always() # always run even if the previous step fails with: - name: acceptance-test-results + name: reference-test-results path: '**/build/test-results/referenceTests/TEST-*.xml' From d7588cbd9c5a97de0277613ecb18e9e8253b8c6b Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Mon, 11 Dec 2023 17:37:45 -0500 Subject: [PATCH 2/5] idk why not finding artifact Signed-off-by: Justin Florentine --- .github/workflows/reference-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index 319cdc685d9..a4c1beca09e 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -28,13 +28,14 @@ jobs: - name: store generated tests uses: actions/upload-artifact@v3 with: - name: reference-tests + name: 'reference-tests' path: 'ethereum/referencetests/build/generated/sources/reference-test/**/*.java' referenceTestEthereum: runs-on: ubuntu-22.04 needs: - prepareReferenceTestEthereum + #TODO: add condition to check pr is approved if: ${{ github.actor != 'dependabot[bot]' }} strategy: fail-fast: false @@ -53,7 +54,8 @@ jobs: - name: retrieve generated tests uses: dawidd6/action-download-artifact@v2 with: - name: reference-tests + name: 'reference-tests' + path: 'ethereum/referencetests/build/generated/sources/reference-test/' - name: get reference test report uses: dawidd6/action-download-artifact@v2 with: From 4094332ccec6ea4f8597d76f22cc8c7f4683fed0 Mon Sep 17 00:00:00 2001 From: jflo Date: Tue, 12 Dec 2023 08:51:48 -0500 Subject: [PATCH 3/5] need to use the download action that defaults to current branch Signed-off-by: jflo --- .github/workflows/reference-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index a4c1beca09e..3689bb18448 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -52,7 +52,7 @@ jobs: distribution: adopt java-version: 17 - name: retrieve generated tests - uses: dawidd6/action-download-artifact@v2 + uses: actions/download-artifact@v3.0.2 with: name: 'reference-tests' path: 'ethereum/referencetests/build/generated/sources/reference-test/' From c675e6109cf5b6c53cc404a42eb4dc6321ad1d61 Mon Sep 17 00:00:00 2001 From: jflo Date: Tue, 12 Dec 2023 08:58:22 -0500 Subject: [PATCH 4/5] no need to correct perms anymore Signed-off-by: jflo --- .github/workflows/reference-tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index 3689bb18448..38cd39cb657 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -77,10 +77,6 @@ jobs: run: echo ${{ steps.split-tests.outputs.paths }} | sed -e 's/^.*java\///' -e 's@/@.@g' -e 's/\.java//' -e 's/^/--tests /' > refTestArgs.txt - name: run reference tests run: ./gradlew ethereum:referenceTests:referenceTests `cat refTestArgs.txt` -Dorg.gradle.parallel=true -Dorg.gradle.caching=true - - name: Correct Ownership in GITHUB_WORKSPACE directory - uses: peter-murray/reset-workspace-ownership-action@v1 - with: - user_id: ${{ env.runner_uid }} - name: Upload Test Report uses: actions/upload-artifact@v3 if: always() # always run even if the previous step fails From 01e4ed8c6c37208e9aa14021cc2868024d8f6de6 Mon Sep 17 00:00:00 2001 From: jflo Date: Tue, 12 Dec 2023 16:57:32 -0500 Subject: [PATCH 5/5] needed to store all test results in different artifacts, then recombine them Signed-off-by: jflo --- .github/workflows/acceptance-tests.yml | 5 +++-- .github/workflows/pre-review.yml | 7 ------- .github/workflows/reference-tests.yml | 5 +++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index d3d58f40414..21c2ec2a971 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -28,7 +28,8 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: branch: main - name: acceptance-test-results + name_is_regexp: true + name: 'acceptance-node-\d*\d-test-results' path: tmp/junit-xml-reports-downloaded if_no_artifact_found: true - name: setup gradle @@ -54,7 +55,7 @@ jobs: - name: Upload Acceptance Test Results uses: actions/upload-artifact@v3.1.0 with: - name: acceptance-test-results + name: acceptance-node-${{matrix.runner_index}}-test-results path: 'acceptance-tests/tests/build/test-results/acceptanceTest/TEST-*.xml' - name: Publish Test Report uses: mikepenz/action-junit-report@v4 diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml index a7100db9a12..b581bfd0bd0 100644 --- a/.github/workflows/pre-review.yml +++ b/.github/workflows/pre-review.yml @@ -83,13 +83,6 @@ jobs: uses: gradle/gradle-build-action@v2.10.0 - name: run unit tests run: ./gradlew $GRADLEW_UNIT_TEST_ARGS -Dorg.gradle.parallel=true -Dorg.gradle.caching=true - - name: Upload Test Report - uses: actions/upload-artifact@v3 - if: always() # always run even if the previous step fails - with: - name: junit-xml-reports - path: '**/build/test-results/test/TEST-*.xml' - retention-days: 1 - name: Publish Test Report uses: mikepenz/action-junit-report@v4 if: success() || failure() # always run even if the build step fails diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index 38cd39cb657..5ad83b4601a 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -60,7 +60,8 @@ jobs: uses: dawidd6/action-download-artifact@v2 with: branch: main - name: reference-test-results + name_is_regexp: true + name: 'reference-test-node-\d*\d-results' path: tmp/ref-xml-reports-downloaded if_no_artifact_found: true - name: setup gradle @@ -81,6 +82,6 @@ jobs: uses: actions/upload-artifact@v3 if: always() # always run even if the previous step fails with: - name: reference-test-results + name: reference-test-node-${{matrix.runner-index}}-results path: '**/build/test-results/referenceTests/TEST-*.xml'