Skip to content

Commit 04c8090

Browse files
baijumeswaniBaiju Meswani
andauthored
Address macos packaging pipeline issues (microsoft#1747)
A recent PR microsoft#1711 introduced changes that made our packaging pipeline build with the relwithdebinfo config. Unfortunately, the cmake presets for relwithdebinfo for macos were not defined and resulted in packaging failures. This pr addresses the issue. --------- Co-authored-by: Baiju Meswani <[email protected]>
1 parent 5c859a4 commit 04c8090

File tree

3 files changed

+32
-1
lines changed

3 files changed

+32
-1
lines changed

.pipelines/nuget-publishing.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ parameters:
8989
- name: build_config
9090
displayName: 'Build Configuration'
9191
type: string
92-
default: 'relwithdebinfo'
92+
default: 'release'
9393
values:
94+
- 'release'
9495
- 'relwithdebinfo'
9596
- 'debug'
9697

cmake/presets/CMakeMacOSBuildPresets.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@
1212
"name": "macos_arm64_cpu_release",
1313
"configurePreset": "macos_arm64_cpu_release"
1414
},
15+
{
16+
"name": "macos_x64_cpu_relwithdebinfo",
17+
"configurePreset": "macos_x64_cpu_relwithdebinfo"
18+
},
19+
{
20+
"name": "macos_arm64_cpu_relwithdebinfo",
21+
"configurePreset": "macos_arm64_cpu_relwithdebinfo"
22+
},
1523
{
1624
"name": "macos_cpu_debug",
1725
"configurePreset": "macos_cpu_debug"

cmake/presets/CMakeMacOSConfigPresets.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,28 @@
109109
},
110110
"displayName": "macos arm64 cpu release",
111111
"binaryDir": "${sourceDir}/build/cpu/osx-arm64"
112+
},
113+
{
114+
"name": "macos_arm64_cpu_relwithdebinfo",
115+
"inherits": [
116+
"macos_cpu_relwithdebinfo"
117+
],
118+
"cacheVariables": {
119+
"CMAKE_OSX_ARCHITECTURES": "arm64"
120+
},
121+
"displayName": "macos arm64 cpu relwithdebinfo",
122+
"binaryDir": "${sourceDir}/build/cpu/osx-arm64"
123+
},
124+
{
125+
"name": "macos_x64_cpu_relwithdebinfo",
126+
"inherits": [
127+
"macos_cpu_relwithdebinfo"
128+
],
129+
"cacheVariables": {
130+
"CMAKE_OSX_ARCHITECTURES": "x86_64"
131+
},
132+
"displayName": "macos x64 cpu relwithdebinfo",
133+
"binaryDir": "${sourceDir}/build/cpu/osx-x64"
112134
}
113135
]
114136
}

0 commit comments

Comments
 (0)