@@ -101,7 +101,7 @@ jobs:
101101 - uses : actions/checkout@v4
102102
103103 - name : " Set licensing if necessary"
104- if : ${{ (github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT) > '231' }}
104+ if : ${{ (github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT) > '231' }}
105105 shell : bash
106106 run : |
107107 echo "ANSYS_DPF_ACCEPT_LA=Y" >> $GITHUB_ENV
@@ -126,9 +126,9 @@ jobs:
126126 with :
127127 path : |
128128 .tox
129- key : ${{ matrix.os }}-${{ matrix.python-version }}-${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}-${{ hashFiles('requirements/*', 'pyproject.toml') }}
129+ key : ${{ matrix.os }}-${{ matrix.python-version }}-${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}-${{ hashFiles('requirements/*', 'pyproject.toml') }}
130130 restore-keys : |
131- ${{ matrix.os }}-${{ matrix.python-version }}-${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}-
131+ ${{ matrix.os }}-${{ matrix.python-version }}-${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}-
132132
133133 - name : " Build the wheel"
134134 shell : bash
@@ -192,7 +192,7 @@ jobs:
192192 with :
193193 dpf-standalone-TOKEN : ${{secrets.DPF_PIPELINE}}
194194 standalone_suffix : ${{ inputs.standalone_suffix }}
195- ANSYS_VERSION : ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}
195+ ANSYS_VERSION : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}
196196
197197 - name : " Check licences of packages"
198198 uses :
ansys/pydpf-actions/[email protected] @@ -222,9 +222,9 @@ jobs:
222222 run : |
223223 if [ $MODE == 'PIP' ]; then
224224 if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then
225- echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}" -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.20240907.dev0"' >> "$GITHUB_OUTPUT"
225+ echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}" -x testenv.commands_pre+="uv pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.20240907.dev0"' >> "$GITHUB_OUTPUT"
226226 else
227- echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}"' >> "$GITHUB_OUTPUT"
227+ echo 'TOX_EXTRA_ARG=--installpkg dist/${{ steps.wheel.outputs.wheel_name }} -x testenv.deps+="-e dpf-standalone/v${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}"' >> "$GITHUB_OUTPUT"
228228 fi
229229 else
230230 if [ ${{ matrix.os }} == 'ubuntu-latest' ]; then
@@ -306,21 +306,21 @@ jobs:
306306 - name : " Upload Test Results"
307307 uses : actions/upload-artifact@v4
308308 with :
309- name : ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}
309+ name : ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}
310310 path : tests/junit/test-results.xml
311311
312312 - name : " Upload coverage to Codecov"
313313 uses : codecov/codecov-action@v4
314314 with :
315315 token : ${{ secrets.CODECOV_TOKEN }} # required
316316 file : ./.tox/.cov/coverage.xml
317- name : ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}.xml
318- flags : ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
317+ name : ${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_pytest_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}.xml
318+ flags : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
319319
320320 - name : " Upload test analytics results to Codecov"
321321 if : ${{ !cancelled() }}
322322 uses : codecov/test-results-action@v1
323323 with :
324324 token : ${{ secrets.CODECOV_TOKEN }}
325- name : test_results_${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}
326- flags : ${{ github.event.inputs.ansys_version || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
325+ name : test_results_${{ env.PACKAGE_NAME }}_${{ matrix.python-version }}_${{ matrix.os }}_${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }}${{ inputs.test_any == 'true' && '_any' || '' }}
326+ flags : ${{ github.event.inputs.ANSYS_VERSION || vars.ANSYS_VERSION_DEFAULT }},${{ matrix.os }},${{ matrix.python-version }}${{ inputs.test_any == 'true' && ',any' || '' }}
0 commit comments