File tree Expand file tree Collapse file tree 1 file changed +4
-8
lines changed Expand file tree Collapse file tree 1 file changed +4
-8
lines changed Original file line number Diff line number Diff line change @@ -275,10 +275,8 @@ jobs:
275
275
# This is not required when no pytest args are provided and it will run all environments
276
276
# by default
277
277
set +e # Disable immediate exit
278
- PYTEST_ARGS='${{ inputs.pytest-args }}'
279
-
280
- if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
281
- ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
278
+ if [ '${{ inputs.pytest-args }}' = '-m flaky' ] || [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
279
+ ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
282
280
exit_code=$?
283
281
else
284
282
ddev env test --base --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
@@ -305,10 +303,8 @@ jobs:
305
303
# This is not required when no pytest args are provided and it will run all environments
306
304
# by default
307
305
set +e # Disable immediate exit
308
- PYTEST_ARGS='${{ inputs.pytest-args }}'
309
-
310
- if [ "$PYTEST_ARGS" = '-m flaky' ] || [ "$PYTEST_ARGS" = '-m "not flaky"' ]; then
311
- ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- $PYTEST_ARGS -k "not fips"
306
+ if [ '${{ inputs.pytest-args }}' = '-m flaky' ] || [ '${{ inputs.pytest-args }}' = '-m "not flaky"' ]; then
307
+ ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} -- ${{ inputs.pytest-args }} -k "not fips"
312
308
exit_code=$?
313
309
else
314
310
ddev env test --new-env --junit ${{ inputs.target }} ${{ inputs.target-env || 'all' }} ${{ inputs.pytest-args != '' && format('-- {0} -k "not fips"', inputs.pytest-args) || '-- -k "not fips"' }}
You can’t perform that action at this time.
0 commit comments