Skip to content

Commit b2a534d

Browse files
CI: Temporary fix for vtk-osmesa (#6407)
Co-authored-by: pyansys-ci-bot <[email protected]>
1 parent 5a82bc5 commit b2a534d

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.github/workflows/ci_cd.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ jobs:
244244
.venv\Scripts\Activate.ps1
245245
# Uninstall conflicting dependencies
246246
pip uninstall --yes vtk
247-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
247+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
248248
249249
- name: Run tests marked with 'solvers'
250250
env:
@@ -357,7 +357,7 @@ jobs:
357357
.venv\Scripts\Activate.ps1
358358
# Uninstall conflicting dependencies
359359
pip uninstall --yes vtk
360-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
360+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
361361
362362
- name: Run tests marked with 'general'
363363
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -425,7 +425,7 @@ jobs:
425425
source .venv/bin/activate
426426
# Uninstall conflicting dependencies
427427
pip uninstall --yes vtk
428-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
428+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
429429
430430
- name: Run tests marked with 'general'
431431
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -490,7 +490,7 @@ jobs:
490490
.venv\Scripts\Activate.ps1
491491
# Uninstall conflicting dependencies
492492
pip uninstall --yes vtk
493-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
493+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
494494
495495
- name: Run tests marked with 'visualization'
496496
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -559,7 +559,7 @@ jobs:
559559
source .venv/bin/activate
560560
# Uninstall conflicting dependencies
561561
pip uninstall --yes vtk
562-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
562+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
563563
564564
- name: Run tests marked with 'visualization'
565565
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -621,7 +621,7 @@ jobs:
621621
.venv\Scripts\Activate.ps1
622622
# Uninstall conflicting dependencies
623623
pip uninstall --yes vtk
624-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
624+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
625625
626626
- name: Run tests marked with 'extensions'
627627
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -689,7 +689,7 @@ jobs:
689689
source .venv/bin/activate
690690
# Uninstall conflicting dependencies
691691
pip uninstall --yes vtk
692-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
692+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
693693
694694
- name: "Install X Virtual Frame Buffer"
695695
run: |
@@ -756,7 +756,7 @@ jobs:
756756
.venv\Scripts\Activate.ps1
757757
# Uninstall conflicting dependencies
758758
pip uninstall --yes vtk
759-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
759+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
760760
761761
- name: Run tests marked with 'filter_solutions'
762762
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2

.github/workflows/manual_draft.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
.venv\Scripts\Activate.ps1
7171
# Uninstall conflicting dependencies
7272
pip uninstall --yes vtk
73-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
73+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
7474
7575
- name: Run tests marked with 'solvers'
7676
env:
@@ -175,7 +175,7 @@ jobs:
175175
.venv\Scripts\Activate.ps1
176176
# Uninstall conflicting dependencies
177177
pip uninstall --yes vtk
178-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
178+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
179179
180180
- name: Run tests marked with 'general'
181181
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -239,7 +239,7 @@ jobs:
239239
source .venv/bin/activate
240240
# Uninstall conflicting dependencies
241241
pip uninstall --yes vtk
242-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa
242+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1
243243
244244
- name: Run tests marked with 'general'
245245
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2

doc/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ help:
2222
@echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"; \
2323
pip uninstall --yes vtk; \
2424
@echo "Installing CI/CD required package(s)"; \
25-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0; \
25+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1; \
2626
fi
2727

2828
# Catch-all target: route all unknown targets to Sphinx using the new
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Temporary fix for vtk-osmesa

doc/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if NOT "%is_vtk_osmesa_installed%" == "vtk-osmesa" if "%ON_CI%" == "True" (
2121
echo "Removing package(s) to avoid conflicts with package(s) needed for CI/CD"
2222
pip uninstall --yes vtk
2323
echo "Installing CI/CD required package(s)"
24-
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.2.20230527.dev0)
24+
pip install --extra-index-url https://wheels.vtk.org vtk-osmesa==9.3.1)
2525
REM End of CICD dedicated setup
2626

2727
if "%1" == "" goto help

0 commit comments

Comments
 (0)