Skip to content

Commit 40fea77

Browse files
authored
Merge pull request #5974 from martin-frbg/ci-macos15
Azure CI: Move mac jobs from deprecated macOS-14 image to macOS-15
2 parents 29de614 + a79dce7 commit 40fea77

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

azure-pipelines.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ jobs:
165165
166166
- job: OSX_OpenMP
167167
pool:
168-
vmImage: 'macOS-14'
168+
vmImage: 'macOS-15'
169169
steps:
170170
- script: |
171171
brew update
@@ -175,7 +175,7 @@ jobs:
175175
176176
- job: OSX_GCC_Nothreads
177177
pool:
178-
vmImage: 'macOS-14'
178+
vmImage: 'macOS-15'
179179
steps:
180180
- script: |
181181
brew update
@@ -237,7 +237,7 @@ jobs:
237237
238238
- job: OSX_dynarch_cmake
239239
pool:
240-
vmImage: 'macOS-14'
240+
vmImage: 'macOS-15'
241241
variables:
242242
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
243243
LIBRARY_PATH: /usr/local/opt/llvm/lib
@@ -286,7 +286,7 @@ jobs:
286286
287287
- job: OSX_NDK_ARMV7
288288
pool:
289-
vmImage: 'macOS-14'
289+
vmImage: 'macOS-15'
290290
steps:
291291
- script: |
292292
brew update
@@ -296,19 +296,19 @@ jobs:
296296
297297
- job: OSX_IOS_ARMV8
298298
pool:
299-
vmImage: 'macOS-14'
299+
vmImage: 'macOS-15'
300300
variables:
301-
CC: /Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
302-
CFLAGS: -O2 -Wno-macro-redefined -isysroot /Applications/Xcode_16.2.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.2.sdk -arch arm64 -miphoneos-version-min=10.0
301+
CC: /Applications/Xcode_16.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
302+
CFLAGS: -O2 -Wno-macro-redefined -isysroot /Applications/Xcode_16.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.5.sdk -arch arm64 -miphoneos-version-min=10.0
303303
steps:
304304
- script: |
305-
ls /Applications/Xcode_16.2.app/Contents/Developer/Platforms/
306-
ls /Applications/Xcode_16.2.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs
305+
ls /Applications/Xcode_16.4.app/Contents/Developer/Platforms/
306+
ls /Applications/Xcode_16.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs
307307
make TARGET=ARMV8 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
308308
309309
- job: OSX_IOS_ARMV7
310310
pool:
311-
vmImage: 'macOS-14'
311+
vmImage: 'macOS-15'
312312
variables:
313313
CC: /Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
314314
CFLAGS: -O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode_16.2.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.2.sdk -arch armv7 -miphoneos-version-min=5.1
@@ -318,15 +318,15 @@ jobs:
318318
319319
- job: OSX_xbuild_DYNAMIC_ARM64
320320
pool:
321-
vmImage: 'macOS-14'
321+
vmImage: 'macOS-15'
322322
variables:
323-
CC: /Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
324-
CFLAGS: -O2 -Wno-macro-redefined -isysroot /Applications/Xcode_16.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.2.sdk -arch arm64
323+
CC: /Applications/Xcode_16.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
324+
CFLAGS: -O2 -Wno-macro-redefined -isysroot /Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX15.5.sdk -arch arm64
325325
steps:
326326
- script: |
327-
ls /Applications/Xcode_16.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
328-
/Applications/Xcode_12.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch arm64 --print-supported-cpus
329-
/Applications/Xcode_16.2.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang --version
327+
ls /Applications/Xcode_16.4.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs
328+
/Applications/Xcode_16.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -arch arm64 --print-supported-cpus
329+
/Applications/Xcode_16.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang --version
330330
make TARGET=ARMV8 DYNAMIC_ARCH=1 NUM_THREADS=32 HOSTCC=clang NOFORTRAN=1
331331
332332
- job: ALPINE_MUSL

0 commit comments

Comments
 (0)