Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge windows and linux pytest workflow #612

Closed
wants to merge 8 commits into from
Closed

Merge windows and linux pytest workflow #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f6189b
Merge windows and linux pytest workflow
ErebusZ Mar 8, 2024
b687775
remove pipefail
ErebusZ Mar 8, 2024
ee41d04
set pipefail
ErebusZ Mar 8, 2024
1c37a9c
set conditional steps
ErebusZ Mar 8, 2024
a9cf680
fix incorrect value
ErebusZ Mar 8, 2024
b78513e
correct quotes
ErebusZ Mar 8, 2024
f25cdfb
fix typo
ErebusZ Mar 8, 2024
6fdd22e
Merge branch 'main' into fix/merge_workflows
ErebusZ Mar 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions .github/workflows/pytest-windows.yml
View file
Open in desktop

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/pytest-linux.yml → .github/workflows/pytest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
python-version: ["3.9", "3.10", "3.11"]
os: [ubuntu-latest]
os: ['ubuntu-latest', 'windows-latest']

steps:
- uses: actions/checkout@v4.1.1
Expand All @@ -39,7 +39,12 @@ jobs:
pip install .[scanner]
pip install .[agent]
python -m pip install -e .
- name: Running tests with pytest.
- name: Running tests with pytest for linux.
run: |
set -o pipefail
pytest -m "not docker and not nats"
if: matrix.os == 'ubuntu-latest'
- name: Running tests with pytest for windows.
run: |
pytest -m "not docker and not nats"
if: matrix.os == 'windows-latest'
Comment on lines +46 to +50
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we need to do if else, then keep the flows separate.