diff --git a/.github/workflows/run-tests-split.yml b/.github/workflows/run-tests-split.yml index cad55ec..701e569 100644 --- a/.github/workflows/run-tests-split.yml +++ b/.github/workflows/run-tests-split.yml @@ -20,6 +20,11 @@ on: working_directory: type: string default: . + outputs: + tests_passed: + # Silly issue with returning job results as workflow outputs + # https://github.com/actions/runner/issues/2495 + value: ${{ fromJSON(toJSON(jobs.test)).result }} env: AR_REPO: ${{ inputs.repo }} @@ -92,13 +97,13 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - name: coveragefiles-${{ matrix.group }} + name: ${{ inputs.flag_prefix }}-coveragefiles-${{ matrix.group }} path: ${{ inputs.working_directory }}/*.coverage.xml - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - name: junitfiles-${{ matrix.group }} + name: ${{ inputs.flag_prefix }}-junitfiles-${{ matrix.group }} path: ${{ inputs.working_directory }}/*junit*.xml upload: @@ -135,14 +140,14 @@ jobs: id: download_coverage uses: actions/download-artifact@v4 with: - pattern: coveragefiles-* + pattern: ${{ inputs.flag_prefix }}-coveragefiles-* merge-multiple: true - name: Download test results id: download_test_results uses: actions/download-artifact@v4 with: - pattern: junitfiles-* + pattern: ${{ inputs.flag_prefix }}-junitfiles-* merge-multiple: true - name: Uploading unit test coverage (${{ matrix.name }}) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c140455..7e3a5f9 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,6 +16,11 @@ on: working_directory: type: string default: . + outputs: + tests_passed: + # Silly issue with returning job results as workflow outputs + # https://github.com/actions/runner/issues/2495 + value: ${{ fromJSON(toJSON(jobs.test)).result }} env: AR_REPO: ${{ inputs.repo }} @@ -67,13 +72,13 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - name: coveragefiles + name: ${{ inputs.flag_prefix }}-coveragefiles path: ${{ inputs.working_directory }}/*.coverage.xml - uses: actions/upload-artifact@v4 if: ${{ !cancelled() }} with: - name: junitfiles + name: ${{ inputs.flag_prefix }}-junitfiles path: ${{ inputs.working_directory }}/*junit*.xml upload: @@ -110,13 +115,13 @@ jobs: id: download_coverage uses: actions/download-artifact@v4 with: - name: coveragefiles + name: ${{ inputs.flag_prefix }}-coveragefiles - name: Download test results id: download_test_results uses: actions/download-artifact@v4 with: - name: junitfiles + name: ${{ inputs.flag_prefix }}-junitfiles - name: Uploading unit test coverage (${{ matrix.name }}) uses: codecov/codecov-action@v5