Merge pull request #3753 from martin-frbg/azure-macos
Move all Apple jobs on Azure to macos-11 following deprecation
This commit is contained in:
commit
51efcfcd29
|
@ -141,7 +141,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_OpenMP
|
- job: OSX_OpenMP
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
steps:
|
steps:
|
||||||
- script: |
|
- script: |
|
||||||
brew update
|
brew update
|
||||||
|
@ -151,7 +151,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_GCC_Nothreads
|
- job: OSX_GCC_Nothreads
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
steps:
|
steps:
|
||||||
- script: |
|
- script: |
|
||||||
brew update
|
brew update
|
||||||
|
@ -167,7 +167,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_OpenMP_Clang
|
- job: OSX_OpenMP_Clang
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
variables:
|
variables:
|
||||||
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
|
@ -180,7 +180,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_OpenMP_Clang_cmake
|
- job: OSX_OpenMP_Clang_cmake
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
variables:
|
variables:
|
||||||
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
|
@ -196,7 +196,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_dynarch_cmake
|
- job: OSX_dynarch_cmake
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
variables:
|
variables:
|
||||||
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
|
@ -210,7 +210,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_Ifort_Clang
|
- job: OSX_Ifort_Clang
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
variables:
|
variables:
|
||||||
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
LD_LIBRARY_PATH: /usr/local/opt/llvm/lib
|
||||||
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_offline.dmg
|
MACOS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/irc_nas/17643/m_HPCKit_p_2021.2.0.2903_offline.dmg
|
||||||
|
@ -243,7 +243,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_NDK_ARMV7
|
- job: OSX_NDK_ARMV7
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
steps:
|
steps:
|
||||||
- script: |
|
- script: |
|
||||||
brew update
|
brew update
|
||||||
|
@ -263,7 +263,7 @@ jobs:
|
||||||
|
|
||||||
- job: OSX_IOS_ARMV7
|
- job: OSX_IOS_ARMV7
|
||||||
pool:
|
pool:
|
||||||
vmImage: 'macOS-10.15'
|
vmImage: 'macOS-11'
|
||||||
variables:
|
variables:
|
||||||
CC: /Applications/Xcode_12.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
|
CC: /Applications/Xcode_12.4.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang
|
||||||
CFLAGS: -O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode_12.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk -arch armv7 -miphoneos-version-min=5.1
|
CFLAGS: -O2 -mno-thumb -Wno-macro-redefined -isysroot /Applications/Xcode_12.4.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.4.sdk -arch armv7 -miphoneos-version-min=5.1
|
||||||
|
|
Loading…
Reference in New Issue