Skip to content

Commit

Permalink
workflows: fix markers again
Browse files Browse the repository at this point in the history
Fix markers, second chance.

Signed-off-by: Giacomo Dematteis <[email protected]>
  • Loading branch information
DematteisGiacomo committed Dec 2, 2024
1 parent 94896f3 commit 4f69507
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/on_target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@ jobs:
run: |
mkdir -p results
if [[ '${{ inputs.pytest_marker }}' == 'no_markers_flag' ]]; then
real_pytest_marker=''
if [[ '${{ inputs.pytest_marker }}' == 'no_markers_flag' || '${{ inputs.pytest_marker }}' == '' ]]; then
pytest_marker_arg=()
else
real_pytest_marker='${{ inputs.pytest_marker }}'
pytest_marker_arg=(-m "${{ inputs.pytest_marker }}")
fi
pytest -v ${real_pytest_marker} \
echo pytest -v "${pytest_marker_arg[@]}"
pytest -v "${pytest_marker_arg[@]}" \
--junit-xml=results/test-results.xml \
--html=results/test-results.html --self-contained-html \
${{ inputs.pytest_path }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pytest_marker:
type: string
required: false
default: -m "not slow"
default: 'not slow'

schedule:
- cron: "0 0 * * *"
Expand Down Expand Up @@ -35,4 +35,4 @@ jobs:
with:
artifact_fw_version: ${{ needs.build.outputs.version }}
artifact_run_id: ${{ needs.build.outputs.run_id }}
pytest_marker: ${{ inputs.pytest_marker || (github.event_name == 'schedule' && 'no_markers_flag') || (github.event_name == 'push' && '-m "not slow"') }}
pytest_marker: ${{ inputs.pytest_marker || (github.event_name == 'schedule' && 'no_markers_flag') || (github.event_name == 'push' && 'not slow') }}

0 comments on commit 4f69507

Please sign in to comment.