From 6a192321b6b4c1df687ce5b0498d4cd7ee5decae Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 30 Nov 2022 22:28:24 +0100 Subject: [PATCH] Adding or operator in Action variable expansions. --- .github/workflows/CoverageCollection.yml | 6 +++--- .github/workflows/UnitTesting.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CoverageCollection.yml b/.github/workflows/CoverageCollection.yml index 4fdff85..6ff76f1 100644 --- a/.github/workflows/CoverageCollection.yml +++ b/.github/workflows/CoverageCollection.yml @@ -132,17 +132,17 @@ jobs: run: | export ENVIRONMENT_NAME="Linux (x86-64)" ABSDIR=$(pwd) - [ -n '${{ inputs.tests_directory }}' ] && cd "${{ inputs.tests_directory }}" + cd "${{ inputs.tests_directory || '.' }}" [ -n '${{ inputs.coverage_config }}' ] && PYCOV_ARGS="--cov-config=${ABSDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS echo "python -m pytest -rA --cov=${ABSDIR} ${PYCOV_ARGS} ${{ inputs.unittest_directory }} --color=yes" python -m pytest -rA --cov=${ABSDIR} $PYCOV_ARGS ${{ inputs.unittest_directory }} --color=yes - name: Convert to cobertura format - run: coverage xml --data-file=${{ inputs.tests_directory }}/.coverage + run: coverage xml --data-file=${{ inputs.tests_directory || '.' }}/.coverage - name: Convert to HTML format run: | - coverage html --data-file=${{ inputs.tests_directory }}/.coverage -d ${{ steps.getVariables.outputs.coverage_report_html_directory }} + coverage html --data-file=${{ inputs.tests_directory || '.' }}/.coverage -d ${{ steps.getVariables.outputs.coverage_report_html_directory }} rm ${{ steps.getVariables.outputs.coverage_report_html_directory }}/.gitignore - name: 📤 Upload 'Coverage Report' artifact diff --git a/.github/workflows/UnitTesting.yml b/.github/workflows/UnitTesting.yml index 45f8d03..5e1c4e2 100644 --- a/.github/workflows/UnitTesting.yml +++ b/.github/workflows/UnitTesting.yml @@ -192,7 +192,7 @@ jobs: if: matrix.system == 'windows' run: | $env:ENVIRONMENT_NAME = "${{ matrix.envname }}" - if ("${{ inputs.tests_directory }}") { cd "${{ inputs.tests_directory }}" } + cd "${{ inputs.tests_directory || '.' }}" $PYTEST_ARGS = if ("${{ inputs.artifact }}") { "--junitxml=TestReportSummary.xml" } else { "" } python -m pytest -rA ${{ inputs.unittest_directory }} $PYTEST_ARGS --color=yes @@ -201,7 +201,7 @@ jobs: run: | export ENVIRONMENT_NAME="${{ matrix.envname }}" ABSDIR=$(pwd) - [ -n '${{ inputs.tests_directory }}' ] && cd "${{ inputs.tests_directory }}" + cd "${{ inputs.tests_directory || '.' }}" [ -n '${{ inputs.coverage_config }}' ] && PYCOV_ARGS="--cov-config=${ABSDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS [ -n '${{ inputs.artifact }}' ] && PYTEST_ARGS='--junitxml=TestReportSummary.xml' || unset PYTEST_ARGS python -m pytest -rA ${{ inputs.unittest_directory }} $PYTEST_ARGS --color=yes @@ -211,6 +211,6 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ inputs.artifact }}-${{ matrix.system }}-${{ matrix.python }} - path: ${{ inputs.tests_directory }}/TestReportSummary.xml + path: ${{ inputs.tests_directory || '.' }}/TestReportSummary.xml if-no-files-found: error retention-days: 1