Skip to content

Commit a61455d

Browse files
committed
Re-split mac and windows into different jobs
Signed-off-by: Larry Gritz <[email protected]>
1 parent f7ffc5e commit a61455d

File tree

1 file changed

+79
-15
lines changed

1 file changed

+79
-15
lines changed

.github/workflows/ci.yml

Lines changed: 79 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,10 @@ jobs:
239239
240240
241241
242-
configs:
242+
#
243+
# Linux Tests
244+
#
245+
linux:
243246
name: "${{matrix.desc}}"
244247
uses: ./.github/workflows/build-steps.yml
245248
with:
@@ -486,9 +489,43 @@ jobs:
486489
sudo rm -rf /usr/local/include/OpenEXR
487490
sudo rm -rf /usr/local/lib64/cmake/{IlmBase,OpenEXR}
488491
489-
#
490-
# Mac Tests
491-
#
492+
493+
#
494+
# MacOS Tests
495+
#
496+
macos:
497+
name: "${{matrix.desc}}"
498+
uses: ./.github/workflows/build-steps.yml
499+
with:
500+
nametag: ${{ matrix.nametag || 'unnamed!' }}
501+
runner: ${{ matrix.runner || 'ubuntu-latest' }}
502+
container: ${{ matrix.container }}
503+
cc_compiler: ${{ matrix.cc_compiler || 'clang' }}
504+
cxx_compiler: ${{ matrix.cxx_compiler || 'clang++' }}
505+
cxx_std: ${{ matrix.cxx_std || '17' }}
506+
build_type: ${{ matrix.build_type || 'Release' }}
507+
depcmds: ${{ matrix.depcmds }}
508+
extra_artifacts: ${{ matrix.extra_artifacts }}
509+
fmt_ver: ${{ matrix.fmt_ver }}
510+
opencolorio_ver: ${{ matrix.opencolorio_ver }}
511+
openexr_ver: ${{ matrix.openexr_ver }}
512+
pybind11_ver: ${{ matrix.pybind11_ver }}
513+
python_ver: ${{ matrix.python_ver }}
514+
setenvs: ${{ matrix.setenvs }}
515+
simd: ${{ matrix.simd }}
516+
skip_build: ${{ matrix.skip_build }}
517+
skip_tests: ${{ matrix.skip_tests }}
518+
abi_check: ${{ matrix.abi_check }}
519+
build_docs: ${{ matrix.build_docs }}
520+
generator: ${{ matrix.generator }}
521+
ctest_args: ${{ matrix.ctest_args }}
522+
ctest_test_timeout: ${{ matrix.ctest_test_timeout || '800' }}
523+
coverage: ${{ matrix.coverage || 0 }}
524+
sonar: ${{ matrix.sonar || 0 }}
525+
strategy:
526+
fail-fast: false
527+
matrix:
528+
include:
492529
- desc: MacOS-13-Intel aclang14/C++17/py3.11
493530
runner: macos-13
494531
nametag: macos13-py311
@@ -506,31 +543,58 @@ jobs:
506543
cxx_compiler: clang++
507544
cxx_std: 20
508545
python_ver: "3.12"
509-
ctest_test_timeout: 800
510-
- desc: MacOS-15-ARM aclang16/C++20/py3.13
546+
- desc: MacOS-15-ARM aclang16/C++20/py3.13
511547
runner: macos-15
512548
nametag: macos15-arm-py313
513549
cc_compiler: clang
514550
cxx_compiler: clang++
515551
cxx_std: 20
516552
python_ver: "3.13"
517-
ctest_test_timeout: 800
518553

519-
#
520-
# Windows Tests
521-
#
554+
555+
#
556+
# Windows Tests
557+
#
558+
windows:
559+
name: "${{matrix.desc}}"
560+
uses: ./.github/workflows/build-steps.yml
561+
with:
562+
nametag: ${{ matrix.nametag || 'unnamed!' }}
563+
runner: ${{ matrix.runner || 'ubuntu-latest' }}
564+
container: ${{ matrix.container }}
565+
cc_compiler: ${{ matrix.cc_compiler }}
566+
cxx_compiler: ${{ matrix.cxx_compiler }}
567+
cxx_std: ${{ matrix.cxx_std || '17' }}
568+
build_type: ${{ matrix.build_type || 'Release' }}
569+
depcmds: ${{ matrix.depcmds }}
570+
extra_artifacts: ${{ matrix.extra_artifacts }}
571+
fmt_ver: ${{ matrix.fmt_ver }}
572+
opencolorio_ver: ${{ matrix.opencolorio_ver }}
573+
openexr_ver: ${{ matrix.openexr_ver }}
574+
pybind11_ver: ${{ matrix.pybind11_ver }}
575+
python_ver: ${{ matrix.python_ver }}
576+
setenvs: ${{ matrix.setenvs }}
577+
simd: ${{ matrix.simd }}
578+
skip_build: ${{ matrix.skip_build }}
579+
skip_tests: ${{ matrix.skip_tests }}
580+
abi_check: ${{ matrix.abi_check }}
581+
build_docs: ${{ matrix.build_docs }}
582+
generator: ${{ matrix.generator }}
583+
ctest_args: ${{ matrix.ctest_args }}
584+
ctest_test_timeout: ${{ matrix.ctest_test_timeout }}
585+
coverage: ${{ matrix.coverage || 0 }}
586+
sonar: ${{ matrix.sonar || 0 }}
587+
strategy:
588+
fail-fast: false
589+
matrix:
590+
include:
522591
- desc: Windows-2019 VS2019
523592
runner: windows-2019
524593
vsver: 2019
525594
generator: "Visual Studio 16 2019"
526-
# openexr_ver: v3.2.4
527595
python_ver: 3.7
528-
# simd: sse4.2
529596
- desc: Windows-2022 VS2022
530597
runner: windows-2022
531598
vsver: 2022
532599
generator: "Visual Studio 17 2022"
533-
# openexr_ver: v3.2.4
534600
python_ver: "3.9"
535-
# simd: sse4.2
536-
# setenvs: export OpenImageIO_BUILD_MISSING_DEPS=none

0 commit comments

Comments
 (0)