Skip to content

Commit 4994b29

Browse files
cary-ilmcary-ilm
authored
Bump macos runners to 14 and 15, drop 13 (AcademySoftwareFoundation#2137)
* Bump macos runners to 14 and 15, drop 13 Signed-off-by: Cary Phillips <[email protected]> * Add a macos-15-intel job Signed-off-by: Cary Phillips <[email protected]> --------- Signed-off-by: Cary Phillips <[email protected]>
1 parent 5bd9a67 commit 4994b29

File tree

3 files changed

+230
-7
lines changed

3 files changed

+230
-7
lines changed

‎.github/workflows/ci_workflow.yml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
# Set values for the "inputs:" as defined in ci_steps.yml
155155
# Note the defaults provided here for the builds that don't specify
156156
# values.
157-
os: ${{ matrix.os || 'macos-14' }}
157+
os: ${{ matrix.os || 'macos-15' }}
158158
build: ${{ matrix.build }}
159159
cc-compiler: ${{ matrix.cc-compiler || 'clang' }}
160160
cxx-compiler: ${{ matrix.cxx-compiler || 'clang++' }}
@@ -206,20 +206,24 @@ jobs:
206206
BUILD_TESTING: 'OFF'
207207

208208
- build: 6
209-
label: macos-13
210-
os: macos-13
209+
label: macos-15-intel
210+
os: macos-15-intel
211211

212212
- build: 7
213+
label: macos-14
214+
os: macos-14
215+
216+
- build: 8
213217
label: universal2
214218
CMAKE_OSX_ARCHITECTURES: "x86_64;arm64"
215219

216-
- build: 8
220+
- build: 9
217221
label: clang c++20
218222
cxx-standard: 20
219223
RUN_TESTING: OFF
220224
validate_install: OFF
221225

222-
- build: 9
226+
- build: 10
223227
label: gcc c++20
224228
cc-compiler: gcc
225229
cxx-compiler: g++

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# cmake -B . -S .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Release -DOPENEXR_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DOPENEXR_ENABLE_THREADING=ON -DOPENEXR_INSTALL_PKG_CONFIG=ON -DOPENEXR_INSTALL_DOCS=ON -DOPENEXR_BUILD_EXAMPLES=ON -DOPENEXR_BUILD_TOOLS=ON -DOPENEXR_FORCE_INTERNAL_IMATH=OFF -DOPENEXR_FORCE_INTERNAL_DEFLATE=OFF -DOPENEXR_FORCE_INTERNAL_OPENJPH=OFF -DBUILD_TESTING=ON -DOPENEXR_RUN_FUZZ_TESTS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON CMAKE_OSX_ARCHITECTURES=\'x86_64\;arm64\'
1+
# cmake -B . -S .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Release -DOPENEXR_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DOPENEXR_ENABLE_THREADING=ON -DOPENEXR_INSTALL_PKG_CONFIG=ON -DOPENEXR_INSTALL_DOCS=ON -DOPENEXR_BUILD_EXAMPLES=ON -DOPENEXR_BUILD_TOOLS=ON -DOPENEXR_FORCE_INTERNAL_IMATH=OFF -DOPENEXR_FORCE_INTERNAL_DEFLATE=OFF -DBUILD_TESTING=ON -DOPENEXR_RUN_FUZZ_TESTS='OFF' -DCMAKE_VERBOSE_MAKEFILE='ON'
22
bin/exr2aces
33
bin/exrenvmap
44
bin/exrheader
@@ -80,7 +80,6 @@ include/OpenEXR/ImfFrameBuffer.h
8080
include/OpenEXR/ImfFramesPerSecond.h
8181
include/OpenEXR/ImfGenericInputFile.h
8282
include/OpenEXR/ImfGenericOutputFile.h
83-
include/OpenEXR/ImfHTCompressor.h
8483
include/OpenEXR/ImfHeader.h
8584
include/OpenEXR/ImfHuf.h
8685
include/OpenEXR/ImfIDManifest.h
@@ -158,6 +157,7 @@ include/OpenEXR/openexr_errors.h
158157
include/OpenEXR/openexr_part.h
159158
include/OpenEXR/openexr_std_attr.h
160159
include/OpenEXR/openexr_version.h
160+
include/OpenEXR/ImfHTCompressor.h
161161
lib/cmake/OpenEXR/OpenEXRConfig.cmake
162162
lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
163163
lib/cmake/OpenEXR/OpenEXRTargets-release.cmake

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

Lines changed: 219 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,219 @@
1+
# cmake -B . -S .. -DCMAKE_INSTALL_PREFIX=../_install -DCMAKE_BUILD_TYPE=Release -DOPENEXR_CXX_STANDARD=17 -DBUILD_SHARED_LIBS=ON -DOPENEXR_ENABLE_THREADING=ON -DOPENEXR_INSTALL_PKG_CONFIG=ON -DOPENEXR_INSTALL_DOCS=ON -DOPENEXR_BUILD_EXAMPLES=ON -DOPENEXR_BUILD_TOOLS=ON -DOPENEXR_FORCE_INTERNAL_IMATH=OFF -DOPENEXR_FORCE_INTERNAL_DEFLATE=OFF -DOPENEXR_FORCE_INTERNAL_OPENJPH=OFF -DBUILD_TESTING=ON -DOPENEXR_RUN_FUZZ_TESTS=OFF -DCMAKE_VERBOSE_MAKEFILE=ON CMAKE_OSX_ARCHITECTURES=\'x86_64\;arm64\'
2+
bin/exr2aces
3+
bin/exrenvmap
4+
bin/exrheader
5+
bin/exrinfo
6+
bin/exrmakepreview
7+
bin/exrmaketiled
8+
bin/exrmanifest
9+
bin/exrmetrics
10+
bin/exrmultipart
11+
bin/exrmultiview
12+
bin/exrstdattr
13+
include/OpenEXR/Iex.h
14+
include/OpenEXR/IexBaseExc.h
15+
include/OpenEXR/IexConfig.h
16+
include/OpenEXR/IexErrnoExc.h
17+
include/OpenEXR/IexExport.h
18+
include/OpenEXR/IexForward.h
19+
include/OpenEXR/IexMacros.h
20+
include/OpenEXR/IexMathExc.h
21+
include/OpenEXR/IexMathFloatExc.h
22+
include/OpenEXR/IexMathIeeeExc.h
23+
include/OpenEXR/IexNamespace.h
24+
include/OpenEXR/IexThrowErrnoExc.h
25+
include/OpenEXR/IlmThread.h
26+
include/OpenEXR/IlmThreadConfig.h
27+
include/OpenEXR/IlmThreadExport.h
28+
include/OpenEXR/IlmThreadForward.h
29+
include/OpenEXR/IlmThreadMutex.h
30+
include/OpenEXR/IlmThreadNamespace.h
31+
include/OpenEXR/IlmThreadPool.h
32+
include/OpenEXR/IlmThreadProcessGroup.h
33+
include/OpenEXR/IlmThreadSemaphore.h
34+
include/OpenEXR/ImfAcesFile.h
35+
include/OpenEXR/ImfArray.h
36+
include/OpenEXR/ImfAttribute.h
37+
include/OpenEXR/ImfBoxAttribute.h
38+
include/OpenEXR/ImfBytesAttribute.h
39+
include/OpenEXR/ImfCRgbaFile.h
40+
include/OpenEXR/ImfChannelList.h
41+
include/OpenEXR/ImfChannelListAttribute.h
42+
include/OpenEXR/ImfCheckFile.h
43+
include/OpenEXR/ImfChromaticities.h
44+
include/OpenEXR/ImfChromaticitiesAttribute.h
45+
include/OpenEXR/ImfCompositeDeepScanLine.h
46+
include/OpenEXR/ImfCompression.h
47+
include/OpenEXR/ImfCompressionAttribute.h
48+
include/OpenEXR/ImfCompressor.h
49+
include/OpenEXR/ImfContext.h
50+
include/OpenEXR/ImfContextInit.h
51+
include/OpenEXR/ImfConvert.h
52+
include/OpenEXR/ImfDeepCompositing.h
53+
include/OpenEXR/ImfDeepFrameBuffer.h
54+
include/OpenEXR/ImfDeepImage.h
55+
include/OpenEXR/ImfDeepImageChannel.h
56+
include/OpenEXR/ImfDeepImageIO.h
57+
include/OpenEXR/ImfDeepImageLevel.h
58+
include/OpenEXR/ImfDeepImageState.h
59+
include/OpenEXR/ImfDeepImageStateAttribute.h
60+
include/OpenEXR/ImfDeepScanLineInputFile.h
61+
include/OpenEXR/ImfDeepScanLineInputPart.h
62+
include/OpenEXR/ImfDeepScanLineOutputFile.h
63+
include/OpenEXR/ImfDeepScanLineOutputPart.h
64+
include/OpenEXR/ImfDeepTiledInputFile.h
65+
include/OpenEXR/ImfDeepTiledInputPart.h
66+
include/OpenEXR/ImfDeepTiledOutputFile.h
67+
include/OpenEXR/ImfDeepTiledOutputPart.h
68+
include/OpenEXR/ImfDoubleAttribute.h
69+
include/OpenEXR/ImfEnvmap.h
70+
include/OpenEXR/ImfEnvmapAttribute.h
71+
include/OpenEXR/ImfExport.h
72+
include/OpenEXR/ImfFlatImage.h
73+
include/OpenEXR/ImfFlatImageChannel.h
74+
include/OpenEXR/ImfFlatImageIO.h
75+
include/OpenEXR/ImfFlatImageLevel.h
76+
include/OpenEXR/ImfFloatAttribute.h
77+
include/OpenEXR/ImfFloatVectorAttribute.h
78+
include/OpenEXR/ImfForward.h
79+
include/OpenEXR/ImfFrameBuffer.h
80+
include/OpenEXR/ImfFramesPerSecond.h
81+
include/OpenEXR/ImfGenericInputFile.h
82+
include/OpenEXR/ImfGenericOutputFile.h
83+
include/OpenEXR/ImfHTCompressor.h
84+
include/OpenEXR/ImfHeader.h
85+
include/OpenEXR/ImfHuf.h
86+
include/OpenEXR/ImfIDManifest.h
87+
include/OpenEXR/ImfIDManifestAttribute.h
88+
include/OpenEXR/ImfIO.h
89+
include/OpenEXR/ImfImage.h
90+
include/OpenEXR/ImfImageChannel.h
91+
include/OpenEXR/ImfImageChannelRenaming.h
92+
include/OpenEXR/ImfImageDataWindow.h
93+
include/OpenEXR/ImfImageIO.h
94+
include/OpenEXR/ImfImageLevel.h
95+
include/OpenEXR/ImfInputFile.h
96+
include/OpenEXR/ImfInputPart.h
97+
include/OpenEXR/ImfInt64.h
98+
include/OpenEXR/ImfIntAttribute.h
99+
include/OpenEXR/ImfKeyCode.h
100+
include/OpenEXR/ImfKeyCodeAttribute.h
101+
include/OpenEXR/ImfLineOrder.h
102+
include/OpenEXR/ImfLineOrderAttribute.h
103+
include/OpenEXR/ImfLut.h
104+
include/OpenEXR/ImfMatrixAttribute.h
105+
include/OpenEXR/ImfMisc.h
106+
include/OpenEXR/ImfMultiPartInputFile.h
107+
include/OpenEXR/ImfMultiPartOutputFile.h
108+
include/OpenEXR/ImfMultiView.h
109+
include/OpenEXR/ImfName.h
110+
include/OpenEXR/ImfNamespace.h
111+
include/OpenEXR/ImfOpaqueAttribute.h
112+
include/OpenEXR/ImfOutputFile.h
113+
include/OpenEXR/ImfOutputPart.h
114+
include/OpenEXR/ImfPartHelper.h
115+
include/OpenEXR/ImfPartType.h
116+
include/OpenEXR/ImfPixelType.h
117+
include/OpenEXR/ImfPreviewImage.h
118+
include/OpenEXR/ImfPreviewImageAttribute.h
119+
include/OpenEXR/ImfRational.h
120+
include/OpenEXR/ImfRationalAttribute.h
121+
include/OpenEXR/ImfRgba.h
122+
include/OpenEXR/ImfRgbaFile.h
123+
include/OpenEXR/ImfRgbaYca.h
124+
include/OpenEXR/ImfSampleCountChannel.h
125+
include/OpenEXR/ImfStandardAttributes.h
126+
include/OpenEXR/ImfStdIO.h
127+
include/OpenEXR/ImfStringAttribute.h
128+
include/OpenEXR/ImfStringVectorAttribute.h
129+
include/OpenEXR/ImfTestFile.h
130+
include/OpenEXR/ImfThreading.h
131+
include/OpenEXR/ImfTileDescription.h
132+
include/OpenEXR/ImfTileDescriptionAttribute.h
133+
include/OpenEXR/ImfTiledInputFile.h
134+
include/OpenEXR/ImfTiledInputPart.h
135+
include/OpenEXR/ImfTiledOutputFile.h
136+
include/OpenEXR/ImfTiledOutputPart.h
137+
include/OpenEXR/ImfTiledRgbaFile.h
138+
include/OpenEXR/ImfTimeCode.h
139+
include/OpenEXR/ImfTimeCodeAttribute.h
140+
include/OpenEXR/ImfUtilExport.h
141+
include/OpenEXR/ImfVecAttribute.h
142+
include/OpenEXR/ImfVersion.h
143+
include/OpenEXR/ImfWav.h
144+
include/OpenEXR/ImfXdr.h
145+
include/OpenEXR/OpenEXRConfig.h
146+
include/OpenEXR/openexr.h
147+
include/OpenEXR/openexr_attr.h
148+
include/OpenEXR/openexr_base.h
149+
include/OpenEXR/openexr_chunkio.h
150+
include/OpenEXR/openexr_coding.h
151+
include/OpenEXR/openexr_compression.h
152+
include/OpenEXR/openexr_config.h
153+
include/OpenEXR/openexr_context.h
154+
include/OpenEXR/openexr_debug.h
155+
include/OpenEXR/openexr_decode.h
156+
include/OpenEXR/openexr_encode.h
157+
include/OpenEXR/openexr_errors.h
158+
include/OpenEXR/openexr_part.h
159+
include/OpenEXR/openexr_std_attr.h
160+
include/OpenEXR/openexr_version.h
161+
lib/cmake/OpenEXR/OpenEXRConfig.cmake
162+
lib/cmake/OpenEXR/OpenEXRConfigVersion.cmake
163+
lib/cmake/OpenEXR/OpenEXRTargets-release.cmake
164+
lib/cmake/OpenEXR/OpenEXRTargets.cmake
165+
lib/libIex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}.dylib
166+
lib/libIex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.dylib
167+
lib/libIex-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.dylib
168+
lib/libIex.dylib
169+
lib/libIlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}.dylib
170+
lib/libIlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.dylib
171+
lib/libIlmThread-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.dylib
172+
lib/libIlmThread.dylib
173+
lib/libOpenEXR-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}.dylib
174+
lib/libOpenEXR-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.dylib
175+
lib/libOpenEXR-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.dylib
176+
lib/libOpenEXR.dylib
177+
lib/libOpenEXRCore-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}.dylib
178+
lib/libOpenEXRCore-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.dylib
179+
lib/libOpenEXRCore-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.dylib
180+
lib/libOpenEXRCore.dylib
181+
lib/libOpenEXRUtil-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.${OPENEXR_VERSION_MAJOR}.${OPENEXR_VERSION_MINOR}.${OPENEXR_VERSION_PATCH}.dylib
182+
lib/libOpenEXRUtil-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.${OPENEXR_SOVERSION}.dylib
183+
lib/libOpenEXRUtil-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR}.dylib
184+
lib/libOpenEXRUtil.dylib
185+
lib/pkgconfig/OpenEXR.pc
186+
share/doc/OpenEXR/examples/deepExamples.cpp
187+
share/doc/OpenEXR/examples/deepExamples.h
188+
share/doc/OpenEXR/examples/deepTiledExamples.cpp
189+
share/doc/OpenEXR/examples/deepTiledExamples.h
190+
share/doc/OpenEXR/examples/drawImage.cpp
191+
share/doc/OpenEXR/examples/drawImage.h
192+
share/doc/OpenEXR/examples/generalInterfaceExamples.cpp
193+
share/doc/OpenEXR/examples/generalInterfaceExamples.h
194+
share/doc/OpenEXR/examples/generalInterfaceTiledExamples.cpp
195+
share/doc/OpenEXR/examples/generalInterfaceTiledExamples.h
196+
share/doc/OpenEXR/examples/lowLevelIoExamples.cpp
197+
share/doc/OpenEXR/examples/lowLevelIoExamples.h
198+
share/doc/OpenEXR/examples/main.cpp
199+
share/doc/OpenEXR/examples/multipartExamples.cpp
200+
share/doc/OpenEXR/examples/multipartExamples.h
201+
share/doc/OpenEXR/examples/namespaceAlias.h
202+
share/doc/OpenEXR/examples/previewImageExamples.cpp
203+
share/doc/OpenEXR/examples/previewImageExamples.h
204+
share/doc/OpenEXR/examples/rgbaInterfaceExamples.cpp
205+
share/doc/OpenEXR/examples/rgbaInterfaceExamples.h
206+
share/doc/OpenEXR/examples/rgbaInterfaceTiledExamples.cpp
207+
share/doc/OpenEXR/examples/rgbaInterfaceTiledExamples.h
208+
share/man/man1/exr2aces.1
209+
share/man/man1/exrcheck.1
210+
share/man/man1/exrenvmap.1
211+
share/man/man1/exrheader.1
212+
share/man/man1/exrinfo.1
213+
share/man/man1/exrmakepreview.1
214+
share/man/man1/exrmaketiled.1
215+
share/man/man1/exrmanifest.1
216+
share/man/man1/exrmetrics.1
217+
share/man/man1/exrmultipart.1
218+
share/man/man1/exrmultiview.1
219+
share/man/man1/exrstdattr.1

0 commit comments

Comments
 (0)