Skip to content

Commit 1c8be66

Browse files
ericstjCopilot
andauthored
Update mac build machines (#7558)
* Update build machines to MacOS 15 * Make sure we specify the target MacOS version now that build machines run on newer version. * Update src/Native/CMakeLists.txt Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent de4eba2 commit 1c8be66

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.vsts-dotnet-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
buildScript: ./build.sh
124124
innerLoop: true
125125
pool:
126-
vmImage: macOS-13
126+
vmImage: macOS-15
127127
helixQueue: OSX.13.Amd64.Open
128128

129129
- template: /build/ci/job-template.yml
@@ -144,7 +144,7 @@ jobs:
144144
_targetFramework: net8.0
145145
innerLoop: true
146146
pool:
147-
vmImage: macOS-13
147+
vmImage: macOS-15
148148
helixQueue: OSX.13.Arm64.Open
149149

150150
- template: /build/ci/job-template.yml

build/.night-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
buildScript: ./build.sh
6464
nightlyBuild: true
6565
pool:
66-
vmImage: macOS-13
66+
vmImage: macOS-15
6767

6868
- template: /build/ci/job-template.yml
6969
parameters:

build/vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
- name: WindowsImage
3131
value: 1es-windows-2022
3232
- name: MacImage
33-
value: macOS-13
33+
value: macOS-15
3434
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
3535
- name: enableSourceIndex
3636
value: true

src/Native/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,10 @@ if (CMAKE_C_COMPILER MATCHES "-?[0-9]+(\\.[0-9]+)?$")
110110
set(CLR_CMAKE_COMPILER_FILE_NAME_VERSION "${CMAKE_MATCH_0}")
111111
endif()
112112

113-
# Set the architecture we are compiling for on APPLE. This lets you cross target from x86_64 -> arm64.
113+
# Set the architecture and target version we are compiling for on APPLE. This lets you cross target from x86_64 to arm64 and vice versa.
114114
if(APPLE)
115115
set(CMAKE_OSX_ARCHITECTURES ${ARCHITECTURE})
116+
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.0")
116117
endif()
117118

118119
# Older CMake doesn't support CMAKE_CXX_STANDARD and GCC/Clang need a switch to enable C++ 11

0 commit comments

Comments
 (0)