Skip to content

Commit cb87068

Browse files
committed
add all os and python versions again
1 parent d0abadf commit cb87068

File tree

1 file changed

+38
-46
lines changed

1 file changed

+38
-46
lines changed

.github/workflows/build-ocp.yml

Lines changed: 38 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,11 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
os: ["ubuntu-22.04", "ubuntu-22.04-arm"]
38-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
39-
python-version: ["3.13"] # restricted for initial testing
38+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
4039
use-vtk: ["vtk", "novtk"]
41-
# exclude:
42-
# - python-version: "3.14"
43-
# use-vtk: "vtk"
40+
exclude:
41+
- python-version: "3.14"
42+
use-vtk: "vtk"
4443
include:
4544
- os: "ubuntu-22.04"
4645
runner: ubuntu-latest
@@ -69,25 +68,23 @@ jobs:
6968
strategy:
7069
fail-fast: false
7170
matrix:
72-
# os: ["macos-15-intel", "macos-15", "windows-2022"]
73-
os: ["macos-15", "windows-2022"] # macos-15-intel temporarily removed (slow delocate)
74-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
75-
python-version: ["3.13"] # restricted for initial testing
71+
os: ["macos-15-intel", "macos-15", "windows-2022"]
72+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
7673
use-vtk: ["vtk", "novtk"]
77-
# exclude:
78-
# - python-version: "3.14"
79-
# use-vtk: "vtk"
74+
exclude:
75+
- python-version: "3.14"
76+
use-vtk: "vtk"
8077
include:
8178
- os: "macos-15"
8279
vtk-libs: ".dylibs/libvtk*.dylib"
8380
vtk-suffix: "/"
8481
vtk-prefix: ""
8582
shells: "bash"
86-
# - os: "macos-15-intel"
87-
# vtk-libs: ".dylibs/libvtk*.dylib"
88-
# vtk-suffix: "/"
89-
# vtk-prefix: ""
90-
# shells: "bash"
83+
- os: "macos-15-intel"
84+
vtk-libs: ".dylibs/libvtk*.dylib"
85+
vtk-suffix: "/"
86+
vtk-prefix: ""
87+
shells: "bash"
9188
- os: "windows-2022"
9289
vtk-libs: "vtk*.dll"
9390
vtk-suffix: "/"
@@ -178,8 +175,7 @@ jobs:
178175
strategy:
179176
fail-fast: false
180177
matrix:
181-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
182-
python-version: ["3.13"] # restricted for initial testing
178+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
183179

184180
steps:
185181
- uses: actions/checkout@v4
@@ -224,12 +220,11 @@ jobs:
224220
fail-fast: false
225221
matrix:
226222
os: ["ubuntu-22.04", "ubuntu-22.04-arm"]
227-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
228-
python-version: ["3.13"] # restricted for initial testing
223+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
229224
use-vtk: ["vtk", "novtk"]
230-
# exclude:
231-
# - python-version: "3.14"
232-
# use-vtk: "vtk"
225+
exclude:
226+
- python-version: "3.14"
227+
use-vtk: "vtk"
233228
include:
234229
- os: "ubuntu-22.04"
235230
runner: ubuntu-latest
@@ -261,14 +256,12 @@ jobs:
261256
strategy:
262257
fail-fast: false
263258
matrix:
264-
# os: ["macos-15-intel", "macos-15", "windows-2022"]
265-
os: ["macos-15", "windows-2022"] # macos-15-intel temporarily removed (slow delocate)
266-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
267-
python-version: ["3.13"] # restricted for initial testing
259+
os: ["macos-15-intel", "macos-15", "windows-2022"]
260+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
268261
use-vtk: ["vtk", "novtk"]
269-
# exclude:
270-
# - python-version: "3.14"
271-
# use-vtk: "vtk"
262+
exclude:
263+
- python-version: "3.14"
264+
use-vtk: "vtk"
272265
include:
273266
- os: "macos-15"
274267
delocate: delocate
@@ -277,13 +270,13 @@ jobs:
277270
env: "MACOSX_DEPLOYMENT_TARGET=11.0"
278271
shells: "bash"
279272
ocp-source-tag: "macos-15"
280-
# - os: "macos-15-intel"
281-
# delocate: delocate
282-
# plat: macosx_11_0_x86_64
283-
# module: "OCP.*.so"
284-
# env: "MACOSX_DEPLOYMENT_TARGET=11.0"
285-
# shells: "bash"
286-
# ocp-source-tag: "macos-15"
273+
- os: "macos-15-intel"
274+
delocate: delocate
275+
plat: macosx_11_0_x86_64
276+
module: "OCP.*.so"
277+
env: "MACOSX_DEPLOYMENT_TARGET=11.0"
278+
shells: "bash"
279+
ocp-source-tag: "macos-15"
287280
- os: "windows-2022"
288281
delocate: delvewheel
289282
plat: win_amd64
@@ -320,21 +313,20 @@ jobs:
320313
matrix:
321314
os:
322315
[
323-
# "macos-15-intel", # temporarily removed (slow delocate)
316+
"macos-15-intel",
324317
"macos-15",
325318
"ubuntu-22.04",
326319
"ubuntu-22.04-arm",
327320
"windows-2022",
328321
]
329-
# python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
330-
python-version: ["3.13"] # restricted for initial testing
322+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
331323
use-vtk: ["vtk", "novtk"]
332-
# exclude:
333-
# - python-version: "3.14"
334-
# use-vtk: "vtk"
324+
exclude:
325+
- python-version: "3.14"
326+
use-vtk: "vtk"
335327
include:
336-
# - os: "macos-15-intel"
337-
# runner: macos-15-intel
328+
- os: "macos-15-intel"
329+
runner: macos-15-intel
338330
- os: "macos-15"
339331
runner: macos-15
340332
- os: "ubuntu-22.04"

0 commit comments

Comments
 (0)