From d0082be82c29f5bf5f3415f2466760cce134f030 Mon Sep 17 00:00:00 2001 From: Justin Florentine Date: Wed, 13 Mar 2024 09:12:00 -0400 Subject: [PATCH] pull_req instead of target Signed-off-by: Justin Florentine --- .github/workflows/acceptance-tests.yml | 8 +------- .github/workflows/integration-tests.yml | 8 +------- .github/workflows/pre-review.yml | 19 +++++++++++++------ .github/workflows/reference-tests.yml | 8 +------- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index bd89270942e..0d241424944 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -1,7 +1,7 @@ name: acceptance-tests on: workflow_dispatch: - pull_request_target: + pull_request: branches: - main - release-* @@ -70,12 +70,6 @@ jobs: with: name: acceptance-node-${{matrix.runner_index}}-test-results path: 'acceptance-tests/tests/build/test-results/**/TEST-*.xml' - - name: Publish Test Report - uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5 - if: (success() || failure()) # always run even if the build step fails - with: - report_paths: 'acceptance-tests/tests/build/test-results/**/TEST-*.xml' - annotate_only: true accepttests-passed: name: "accepttests-passed" runs-on: ubuntu-22.04 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 944422cbdf8..8a60d09017d 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,7 +1,7 @@ name: integration-tests on: workflow_dispatch: - pull_request_target: + pull_request: branches: - main - release-* @@ -36,11 +36,5 @@ jobs: cache-disabled: true - name: run integration tests run: ./gradlew integrationTest compileJmh - - name: Publish Test Report - uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5 - if: (success() || failure()) - with: - report_paths: '**/build/test-results/integrationTest/TEST-*.xml' - annotate_only: true diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml index b3adc7c42cd..60ba3fcb591 100644 --- a/.github/workflows/pre-review.yml +++ b/.github/workflows/pre-review.yml @@ -1,7 +1,7 @@ name: pre-review on: - pull_request_target: + pull_request: branches: - main - release-* @@ -91,6 +91,14 @@ jobs: - "ethereum:api:testRemainder" - "ethereum:eth:test" - "ethereum:core:test" + archive_name: + - "everythingElse" + - "consensusCrypto" + - "apiBonsai" + - "apiForest" + - "apiRemainder" + - "eth" + - "core" steps: - name: Checkout Repo uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 @@ -108,12 +116,11 @@ jobs: - name: run unit tests id: unitTest run: ./gradlew $GRADLEW_UNIT_TEST_ARGS - - name: Publish Test Report - uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5 - if: success() || failure() # always run even if the build step fails + - name: Upload Acceptance Test Results + uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 with: - report_paths: '**/test-results/**/TEST-*.xml' - annotate_only: true + name: unit-${{matrix.archive_name}}-test-results + path: '**/test-results/**/TEST-*.xml' unittests-passed: name: "unittests-passed" runs-on: ubuntu-22.04 diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml index f9dd87c4589..c83022526e4 100644 --- a/.github/workflows/reference-tests.yml +++ b/.github/workflows/reference-tests.yml @@ -1,7 +1,7 @@ name: reference-tests on: workflow_dispatch: - pull_request_target: + pull_request: branches: - main - release-* @@ -62,12 +62,6 @@ jobs: with: name: reference-test-node-${{matrix.runner_index}}-results path: '**/build/test-results/referenceTests/TEST-*.xml' - - name: Publish Test Report - uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5 - if: success() || failure() # always run even if the build step fails - with: - report_paths: '**/build/test-results/referenceTests/TEST-*.xml' - annotate_only: true reftests-passed: name: "reftests-passed" runs-on: ubuntu-22.04