Trying to solve problems with macOS.

This commit is contained in:
Patrick Lehmann
2022-11-30 21:36:55 +01:00
parent e526218346
commit 9171343062
2 changed files with 10 additions and 10 deletions

View File

@@ -131,11 +131,11 @@ jobs:
continue-on-error: true continue-on-error: true
run: | run: |
export ENVIRONMENT_NAME="Linux (x86-64)" export ENVIRONMENT_NAME="Linux (x86-64)"
RELDIR="$(realpath --relative-to=${{ inputs.tests_directory }} .)" ABSDIR=$(pwd)
cd ${{ inputs.tests_directory }} [ -n '${{ inputs.tests_directory }}' ] && cd "${{ inputs.tests_directory }}"
[ 'x${{ inputs.coverage_config }}' != 'x' ] && PYCOV_ARGS="--cov-config=${RELDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS [ -n '${{ inputs.coverage_config }}' ] && PYCOV_ARGS="--cov-config=${ABSDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS
echo "python -m pytest -rA --cov=${RELDIR} ${PYCOV_ARGS} ${{ inputs.unittest_directory }} --color=yes" echo "python -m pytest -rA --cov=${ABSDIR} ${PYCOV_ARGS} ${{ inputs.unittest_directory }} --color=yes"
python -m pytest -rA --cov=${RELDIR} $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 - name: Convert to cobertura format
run: coverage xml --data-file=${{ inputs.tests_directory }}/.coverage run: coverage xml --data-file=${{ inputs.tests_directory }}/.coverage

View File

@@ -182,7 +182,7 @@ jobs:
- name: 🔧 Install pip dependencies (MSYS2) - name: 🔧 Install pip dependencies (MSYS2)
if: matrix.system == 'msys2' if: matrix.system == 'msys2'
run: | run: |
if [ 'x${{ inputs.mingw_requirements }}' != 'x' ]; then if [ -n '${{ inputs.mingw_requirements }}' ]; then
python -m pip install --disable-pip-version-check ${{ inputs.mingw_requirements }} python -m pip install --disable-pip-version-check ${{ inputs.mingw_requirements }}
else else
python -m pip install --disable-pip-version-check ${{ inputs.requirements }} python -m pip install --disable-pip-version-check ${{ inputs.requirements }}
@@ -200,10 +200,10 @@ jobs:
if: matrix.system != 'windows' if: matrix.system != 'windows'
run: | run: |
export ENVIRONMENT_NAME="${{ matrix.envname }}" export ENVIRONMENT_NAME="${{ matrix.envname }}"
RELDIR="$(realpath --relative-to=${{ inputs.tests_directory }} .)" ABSDIR=$(pwd)
cd ${{ inputs.tests_directory }} [ -n '${{ inputs.tests_directory }}' ] && cd "${{ inputs.tests_directory }}"
[ 'x${{ inputs.coverage_config }}' != 'x' ] && PYCOV_ARGS="--cov-config=${RELDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS [ -n '${{ inputs.coverage_config }}' ] && PYCOV_ARGS="--cov-config=${ABSDIR}/${{ inputs.coverage_config }}" || unset PYCOV_ARGS
[ 'x${{ inputs.artifact }}' != 'x' ] && PYTEST_ARGS='--junitxml=TestReportSummary.xml' || unset PYTEST_ARGS [ -n '${{ inputs.artifact }}' ] && PYTEST_ARGS='--junitxml=TestReportSummary.xml' || unset PYTEST_ARGS
python -m pytest -rA ${{ inputs.unittest_directory }} $PYTEST_ARGS --color=yes python -m pytest -rA ${{ inputs.unittest_directory }} $PYTEST_ARGS --color=yes
- name: 📤 Upload 'TestReportSummary.xml' artifact - name: 📤 Upload 'TestReportSummary.xml' artifact