Skip to content

Commit 86ca795

Browse files
cary-ilmcary-ilm
committed
Bump macos runner to 14 and 15, drop 13
macos-13 GitHub runner are retiring soon. Also, add an macos-15-intel job, since the macos-14 and macos-15 are both ARM. Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent c005e35 commit 86ca795

3 files changed

Lines changed: 159 additions & 47 deletions

File tree

‎.github/workflows/ci_workflow.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
# Set values for the "inputs:" as defined in ci_steps.yml
107107
# Note the defaults provided here for the builds that don't specify
108108
# values.
109-
os: ${{ matrix.os || 'macos-14' }}
109+
os: ${{ matrix.os || 'macos-15' }}
110110
build: ${{ matrix.build }}
111111
cxx-standard: ${{ matrix.cxx-standard || '14' }}
112112
build-type: ${{ matrix.build-type || 'Release' }}
@@ -145,10 +145,14 @@ jobs:
145145
cxx-standard: 14
146146

147147
- build: 5
148-
label: macos-13
149-
os: macos-13
148+
label: macos-15-intel
149+
os: macos-15-intel
150150

151151
- build: 6
152+
label: macos-14
153+
os: macos-14
154+
155+
- build: 7
152156
label: Apple Frameworks
153157
IMATH_BUILD_APPLE_FRAMEWORKS: 'ON'
154158
BUILD_TESTING: 'OFF'

‎share/ci/install_manifest/install_manifest.macos.6.txt‎

Lines changed: 106 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,108 @@
11
# SPDX-License-Identifier: BSD-3-Clause
22
# Copyright (c) Contributors to the OpenEXR Project.
3-
# cmake -B /Users/runner/work/Imath/Imath/_build -S /Users/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/Users/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS=ON -DBUILD_TESTING=OFF -DPYTHON=OFF -DPYBIND11=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_SYSTEM_NAME=iOS
4-
lib/Imath.framework/Headers/ImathBox.h
5-
lib/Imath.framework/Headers/ImathBoxAlgo.h
6-
lib/Imath.framework/Headers/ImathColor.h
7-
lib/Imath.framework/Headers/ImathColorAlgo.h
8-
lib/Imath.framework/Headers/ImathConfig.h
9-
lib/Imath.framework/Headers/ImathEuler.h
10-
lib/Imath.framework/Headers/ImathExport.h
11-
lib/Imath.framework/Headers/ImathForward.h
12-
lib/Imath.framework/Headers/ImathFrame.h
13-
lib/Imath.framework/Headers/ImathFrustum.h
14-
lib/Imath.framework/Headers/ImathFrustumTest.h
15-
lib/Imath.framework/Headers/ImathFun.h
16-
lib/Imath.framework/Headers/ImathGL.h
17-
lib/Imath.framework/Headers/ImathGLU.h
18-
lib/Imath.framework/Headers/ImathInt64.h
19-
lib/Imath.framework/Headers/ImathInterval.h
20-
lib/Imath.framework/Headers/ImathLine.h
21-
lib/Imath.framework/Headers/ImathLineAlgo.h
22-
lib/Imath.framework/Headers/ImathMath.h
23-
lib/Imath.framework/Headers/ImathMatrix.h
24-
lib/Imath.framework/Headers/ImathMatrixAlgo.h
25-
lib/Imath.framework/Headers/ImathNamespace.h
26-
lib/Imath.framework/Headers/ImathPlane.h
27-
lib/Imath.framework/Headers/ImathPlatform.h
28-
lib/Imath.framework/Headers/ImathQuat.h
29-
lib/Imath.framework/Headers/ImathRandom.h
30-
lib/Imath.framework/Headers/ImathRoots.h
31-
lib/Imath.framework/Headers/ImathShear.h
32-
lib/Imath.framework/Headers/ImathSphere.h
33-
lib/Imath.framework/Headers/ImathTypeTraits.h
34-
lib/Imath.framework/Headers/ImathVec.h
35-
lib/Imath.framework/Headers/ImathVecAlgo.h
36-
lib/Imath.framework/Headers/half.h
37-
lib/Imath.framework/Headers/halfFunction.h
38-
lib/Imath.framework/Headers/halfLimits.h
39-
lib/Imath.framework/Imath
40-
lib/Imath.framework/Info.plist
41-
lib/Imath.framework/Resources/ImathConfig.cmake
42-
lib/Imath.framework/Resources/ImathConfigVersion.cmake
43-
lib/Imath.framework/Resources/ImathTargets.cmake
44-
lib/Imath.framework/Resources/LICENSE.md
45-
lib/Imath.framework/Resources/README.md
46-
lib/Imath.framework/Resources/SECURITY.md
3+
# cmake -B /Users/runner/work/Imath/Imath/_build -S /Users/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/Users/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS= -DBUILD_TESTING=ON -DPYTHON=ON -DPYBIND11=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DPython3_EXECUTABLE=/Library/Frameworks/Python.framework/Versions/Current/bin/python -DPYTHON_INSTALL_DIR=/Users/runner/work/Imath/Imath/_install/python -DNumpy_INCLUDE_DIR=/Library/Frameworks/Python.framework/Versions/3.13/lib/python3.13/site-packages/numpy/core/include -DIMATH_TEST_PYTHON= -DIMATH_TEST_PYBIND11= -Dpybind11_DIR=/Library/Frameworks/Python.framework/Versions/3.13/lib/python3.13/site-packages/pybind11/share/cmake/pybind11 -DBoost_ROOT=/Users/runner/work/Imath/Imath/_conan -DCMAKE_TOOLCHAIN_FILE=/Users/runner/work/Imath/Imath/_conan/conan_toolchain.cmake
4+
include/Imath/ImathBox.h
5+
include/Imath/ImathBoxAlgo.h
6+
include/Imath/ImathColor.h
7+
include/Imath/ImathColorAlgo.h
8+
include/Imath/ImathConfig.h
9+
include/Imath/ImathEuler.h
10+
include/Imath/ImathExport.h
11+
include/Imath/ImathForward.h
12+
include/Imath/ImathFrame.h
13+
include/Imath/ImathFrustum.h
14+
include/Imath/ImathFrustumTest.h
15+
include/Imath/ImathFun.h
16+
include/Imath/ImathGL.h
17+
include/Imath/ImathGLU.h
18+
include/Imath/ImathInt64.h
19+
include/Imath/ImathInterval.h
20+
include/Imath/ImathLine.h
21+
include/Imath/ImathLineAlgo.h
22+
include/Imath/ImathMath.h
23+
include/Imath/ImathMatrix.h
24+
include/Imath/ImathMatrixAlgo.h
25+
include/Imath/ImathNamespace.h
26+
include/Imath/ImathPlane.h
27+
include/Imath/ImathPlatform.h
28+
include/Imath/ImathQuat.h
29+
include/Imath/ImathRandom.h
30+
include/Imath/ImathRoots.h
31+
include/Imath/ImathShear.h
32+
include/Imath/ImathSphere.h
33+
include/Imath/ImathTypeTraits.h
34+
include/Imath/ImathVec.h
35+
include/Imath/ImathVecAlgo.h
36+
include/Imath/half.h
37+
include/Imath/halfFunction.h
38+
include/Imath/halfLimits.h
39+
include/Imath/PyBindImath.h
40+
include/Imath/PyBindImathExport.h
41+
include/Imath/PyImath.h
42+
include/Imath/PyImathAPI.h
43+
include/Imath/PyImathAutovectorize.h
44+
include/Imath/PyImathBasicTypes.h
45+
include/Imath/PyImathBox.h
46+
include/Imath/PyImathBoxArrayImpl.h
47+
include/Imath/PyImathBufferProtocol.h
48+
include/Imath/PyImathColor.h
49+
include/Imath/PyImathColor3ArrayImpl.h
50+
include/Imath/PyImathColor4Array2DImpl.h
51+
include/Imath/PyImathColor4ArrayImpl.h
52+
include/Imath/PyImathDecorators.h
53+
include/Imath/PyImathEuler.h
54+
include/Imath/PyImathExport.h
55+
include/Imath/PyImathFixedArray.h
56+
include/Imath/PyImathFixedArray2D.h
57+
include/Imath/PyImathFixedArrayTraits.h
58+
include/Imath/PyImathFixedMatrix.h
59+
include/Imath/PyImathFixedVArray.h
60+
include/Imath/PyImathFrustum.h
61+
include/Imath/PyImathFun.h
62+
include/Imath/PyImathLine.h
63+
include/Imath/PyImathMathExc.h
64+
include/Imath/PyImathMatrix.h
65+
include/Imath/PyImathOperators.h
66+
include/Imath/PyImathPlane.h
67+
include/Imath/PyImathQuat.h
68+
include/Imath/PyImathQuatOperators.h
69+
include/Imath/PyImathRandom.h
70+
include/Imath/PyImathShear.h
71+
include/Imath/PyImathStringArray.h
72+
include/Imath/PyImathStringArrayRegister.h
73+
include/Imath/PyImathStringTable.h
74+
include/Imath/PyImathTask.h
75+
include/Imath/PyImathUtil.h
76+
include/Imath/PyImathVec.h
77+
include/Imath/PyImathVec2Impl.h
78+
include/Imath/PyImathVec3ArrayImpl.h
79+
include/Imath/PyImathVec3Impl.h
80+
include/Imath/PyImathVec4ArrayImpl.h
81+
include/Imath/PyImathVec4Impl.h
82+
include/Imath/PyImathVecOperators.h
83+
lib/cmake/Imath/ImathConfig.cmake
84+
lib/cmake/Imath/ImathConfigVersion.cmake
85+
lib/cmake/Imath/ImathTargets-release.cmake
86+
lib/cmake/Imath/ImathTargets.cmake
87+
lib/cmake/Imath/PyBindImathTargets-release.cmake
88+
lib/cmake/Imath/PyBindImathTargets.cmake
89+
lib/cmake/Imath/PyImathTargets-release.cmake
90+
lib/cmake/Imath/PyImathTargets.cmake
91+
lib/libImath-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
92+
lib/libImath-$MAJOR_$MINOR.$SOVERSION.dylib
93+
lib/libImath-$MAJOR_$MINOR.dylib
94+
lib/libImath.dylib
95+
lib/libPyBindImath.dylib
96+
lib/libPyBindImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
97+
lib/libPyBindImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.$SOVERSION.dylib
98+
lib/libPyBindImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.dylib
99+
lib/libPyImath.dylib
100+
lib/libPyImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.$SOVERSION.$MAJOR.$MINOR.$PATCH.dylib
101+
lib/libPyImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.$SOVERSION.dylib
102+
lib/libPyImath_Python$PYTHONMAJOR_$PYTHONMINOR-$MAJOR_$MINOR.dylib
103+
lib/pkgconfig/Imath.pc
104+
lib/pkgconfig/PyBindImath.pc
105+
lib/pkgconfig/PyImath.pc
106+
python/imath.so
107+
python/imathnumpy.so
108+
python/pybindimath.cpython-$PYTHONMAJOR$PYTHONMINOR-darwin.so

‎share/ci/install_manifest/install_manifest.macos.7.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: BSD-3-Clause
2+
# Copyright (c) Contributors to the OpenEXR Project.
3+
# cmake -B /Users/runner/work/Imath/Imath/_build -S /Users/runner/work/Imath/Imath -DCMAKE_INSTALL_PREFIX=/Users/runner/work/Imath/Imath/_install -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DIMATH_INSTALL_PKG_CONFIG=ON -DIMATH_BUILD_APPLE_FRAMEWORKS=ON -DBUILD_TESTING=OFF -DPYTHON=OFF -DPYBIND11=OFF -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_SYSTEM_NAME=iOS
4+
lib/Imath.framework/Headers/ImathBox.h
5+
lib/Imath.framework/Headers/ImathBoxAlgo.h
6+
lib/Imath.framework/Headers/ImathColor.h
7+
lib/Imath.framework/Headers/ImathColorAlgo.h
8+
lib/Imath.framework/Headers/ImathConfig.h
9+
lib/Imath.framework/Headers/ImathEuler.h
10+
lib/Imath.framework/Headers/ImathExport.h
11+
lib/Imath.framework/Headers/ImathForward.h
12+
lib/Imath.framework/Headers/ImathFrame.h
13+
lib/Imath.framework/Headers/ImathFrustum.h
14+
lib/Imath.framework/Headers/ImathFrustumTest.h
15+
lib/Imath.framework/Headers/ImathFun.h
16+
lib/Imath.framework/Headers/ImathGL.h
17+
lib/Imath.framework/Headers/ImathGLU.h
18+
lib/Imath.framework/Headers/ImathInt64.h
19+
lib/Imath.framework/Headers/ImathInterval.h
20+
lib/Imath.framework/Headers/ImathLine.h
21+
lib/Imath.framework/Headers/ImathLineAlgo.h
22+
lib/Imath.framework/Headers/ImathMath.h
23+
lib/Imath.framework/Headers/ImathMatrix.h
24+
lib/Imath.framework/Headers/ImathMatrixAlgo.h
25+
lib/Imath.framework/Headers/ImathNamespace.h
26+
lib/Imath.framework/Headers/ImathPlane.h
27+
lib/Imath.framework/Headers/ImathPlatform.h
28+
lib/Imath.framework/Headers/ImathQuat.h
29+
lib/Imath.framework/Headers/ImathRandom.h
30+
lib/Imath.framework/Headers/ImathRoots.h
31+
lib/Imath.framework/Headers/ImathShear.h
32+
lib/Imath.framework/Headers/ImathSphere.h
33+
lib/Imath.framework/Headers/ImathTypeTraits.h
34+
lib/Imath.framework/Headers/ImathVec.h
35+
lib/Imath.framework/Headers/ImathVecAlgo.h
36+
lib/Imath.framework/Headers/half.h
37+
lib/Imath.framework/Headers/halfFunction.h
38+
lib/Imath.framework/Headers/halfLimits.h
39+
lib/Imath.framework/Imath
40+
lib/Imath.framework/Info.plist
41+
lib/Imath.framework/Resources/ImathConfig.cmake
42+
lib/Imath.framework/Resources/ImathConfigVersion.cmake
43+
lib/Imath.framework/Resources/ImathTargets.cmake
44+
lib/Imath.framework/Resources/LICENSE.md
45+
lib/Imath.framework/Resources/README.md
46+
lib/Imath.framework/Resources/SECURITY.md

0 commit comments

Comments
 (0)