Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
57 changes: 23 additions & 34 deletions .github/workflows/ci_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ jobs:
- name: "Install os packages"
run: |
sudo apt update
sudo apt install libgl1-mesa-glx xvfb -y
sudo apt install libgl1-mesa-glx -y

- name: Create Python venv
run: |
Expand All @@ -447,9 +447,9 @@ jobs:
retry_on: error
timeout_minutes: 40
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
xvfb-run pytest tests/system -n auto --dist loadfile -v --cov
pytest tests/system -n auto --dist loadfile -v --cov

- name: "Create coverage files"
run: |
Expand Down Expand Up @@ -499,7 +499,7 @@ jobs:
- name: "Install os packages"
run: |
sudo apt update
sudo apt install libgl1-mesa-glx xvfb -y
sudo apt install libgl1-mesa-glx -y

- name: Create Python venv
run: |
Expand All @@ -522,9 +522,9 @@ jobs:
retry_on: error
timeout_minutes: 40
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
xvfb-run pytest tests/system -n auto --dist loadfile -v --cov
pytest tests/system -n auto --dist loadfile -v --cov

- name: "Create coverage files"
run: |
Expand Down Expand Up @@ -574,7 +574,7 @@ jobs:
- name: "Install os packages"
run: |
sudo apt update
sudo apt install libgl1-mesa-glx xvfb -y
sudo apt install libgl1-mesa-glx -y

- name: Create Python venv
run: |
Expand All @@ -597,9 +597,9 @@ jobs:
retry_on: error
timeout_minutes: 40
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
xvfb-run pytest tests/unit -n auto --dist loadfile -v --cov
pytest tests/unit -n auto --dist loadfile -v --cov

- name: "Create coverage files"
run: |
Expand Down Expand Up @@ -649,7 +649,7 @@ jobs:
- name: "Install os packages"
run: |
sudo apt update
sudo apt install libgl1-mesa-glx xvfb -y
sudo apt install libgl1-mesa-glx -y

- name: Create Python venv
run: |
Expand All @@ -672,9 +672,9 @@ jobs:
retry_on: error
timeout_minutes: 40
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
xvfb-run pytest tests/unit -n auto --dist loadfile -v --cov
pytest tests/unit -n auto --dist loadfile -v --cov

- name: "Create coverage files"
run: |
Expand Down Expand Up @@ -713,6 +713,9 @@ jobs:
with:
persist-credentials: false

- name: Set up headless display
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2

- name: Setup Python
uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
with:
Expand Down Expand Up @@ -746,13 +749,6 @@ jobs:
. .venv\Scripts\Activate.ps1
python -m pip install .

- name: Install CI dependencies (e.g. vtk-osmesa)
run: |
.venv\Scripts\Activate.ps1
# Uninstall conflicting dependencies
pip uninstall --yes vtk
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1

- name: Run PyAEDT tests
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
env:
Expand Down Expand Up @@ -813,6 +809,9 @@ jobs:
with:
persist-credentials: false

- name: Set up headless display
uses: pyvista/setup-headless-display-action@7d84ae825e6d9297a8e99bdbbae20d1b919a0b19 # v4.2

- name: Install OS packages
run: |
sudo apt update
Expand Down Expand Up @@ -844,28 +843,18 @@ jobs:
env:
ANSYSEM: ${{ env.ANSYSEM_ROOT252 }}
run: |
export LD_LIBRARY_PATH=${ANSYSEM}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${ANSYSEM}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
pip install --no-cache-dir external/pyaedt[tests]

- name: Install PyEDB
env:
ANSYSEM: ${{ env.ANSYSEM_ROOT252 }}
run: |
export LD_LIBRARY_PATH=${ANSYSEM}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${ANSYSEM}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
python -m pip install .

- name: Install CI dependencies (e.g. vtk-osmesa)
env:
ANSYSEM: ${{ env.ANSYSEM_ROOT252 }}
run: |
export LD_LIBRARY_PATH=${ANSYSEM}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
. .venv/bin/activate
# Uninstall conflicting dependencies
pip uninstall --yes vtk
pip install --index-url https://wheels.vtk.org vtk-osmesa==9.3.1

- name: Run PyAEDT tests
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
env:
Expand All @@ -875,7 +864,7 @@ jobs:
retry_on: error
timeout_minutes: 50
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
pytest -v external/pyaedt/tests/system/general/test_01_3dlayout_edb.py
pytest -v external/pyaedt/tests/system/general/test_01_configuration_files.py
Expand All @@ -890,7 +879,7 @@ jobs:
retry_on: error
timeout_minutes: 50
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
pytest -v external/pyaedt/tests/system/solvers/test_45_workflows.py
pytest -v external/pyaedt/tests/system/solvers/test_00_analyze.py
Expand All @@ -904,7 +893,7 @@ jobs:
retry_on: error
timeout_minutes: 50
command: |
export LD_LIBRARY_PATH=${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH="${{ env.ANSYSEM_ROOT252 }}/common/mono/Linux64/lib64${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
. .venv/bin/activate
pytest -v external/pyaedt/tests/system/extensions/test_cutout.py
pytest -v external/pyaedt/tests/system/extensions/test_configure_layout.py
Expand Down
1 change: 1 addition & 0 deletions doc/changelog.d/1651.maintenance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Leverage new \`\`vtk-osmesa\`\` logic in CI
Loading