Skip to content

Commit b6884ce

Browse files
committed
Address pull-request review comments from copilot
1 parent 376018b commit b6884ce

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

tools/ci_build/github/azure-pipelines/custom-nuget-packaging-pipeline.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ extends:
134134

135135
- template: templates/foundry-local-nuget-packaging.yml
136136
parameters:
137-
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
138-
DependsOn: [Windows_Packaging_CUDA, Windows_Packaging_CPU_arm64, ManagedNugetPackaging, MacOS_C_API_Package_Publish]
137+
DependsOn: [Setup, Windows_Packaging_CUDA, Windows_Packaging_CPU_arm64, ManagedNugetPackaging, MacOS_C_API_Package_Publish]
139138
DoEsrp: true
140139
PackageName: 'Microsoft.ML.OnnxRuntime.Foundry'

tools/ci_build/github/azure-pipelines/templates/foundry-local-nuget-packaging.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
inputs:
7474
targetType: 'inline'
7575
script: |
76-
mkdir -p $(Build.BinariesDirectory)/osx-arm64
76+
New-Item -ItemType Directory -Force -Path "$(Build.BinariesDirectory)/osx-arm64" | Out-Null
7777
Move-Item -Path $(Build.BinariesDirectory)/osx/onnxruntime-osx-arm64* -Destination $(Build.BinariesDirectory)/osx-arm64
7878
7979
- task: PowerShell@2
@@ -121,20 +121,19 @@ stages:
121121
Expand-Archive -Path $(Build.BinariesDirectory)/win-arm64/onnxruntime-win-arm64*.zip -DestinationPath $(Build.BinariesDirectory)/win-arm64
122122
$osx_arm64_archive = (Get-ChildItem -Path $(Build.BinariesDirectory)/osx-arm64 -Filter onnxruntime-osx-arm64*)[0].FullName
123123
tar -xzf $osx_arm64_archive -C $(Build.BinariesDirectory)/osx-arm64 2>$null
124-
$win_x64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/win-x64 -Filter onnxruntime-win-x64-cuda*)[0].FullName
125-
$win_arm64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/win-arm64 -Filter onnxruntime-win-arm64*)[0].FullName
126-
$osx_arm64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/osx-arm64 -Filter onnxruntime-osx-arm64*)[0].FullName
124+
$win_x64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/win-x64 -Directory -Filter onnxruntime-win-x64-cuda*)[0].FullName
125+
$win_arm64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/win-arm64 -Directory -Filter onnxruntime-win-arm64*)[0].FullName
126+
$osx_arm64 = (Get-ChildItem -Path $(Build.BinariesDirectory)/osx-arm64 -Directory -Filter onnxruntime-osx-arm64*)[0].FullName
127127
Write-Host "##vso[task.setvariable variable=win_x64;]$win_x64"
128128
Write-Host "##vso[task.setvariable variable=win_arm64;]$win_arm64"
129-
Write-Host "##vso[task.setvariable variable=osx_x64;]$osx_x64"
130129
Write-Host "##vso[task.setvariable variable=osx_arm64;]$osx_arm64"
131130
workingDirectory: $(Build.BinariesDirectory)
132131

133132
- task: PythonScript@0
134133
displayName: 'Generate Nuget Package'
135134
inputs:
136135
scriptPath: '$(Build.SourcesDirectory)/tools/nuget/generate_nuspec_for_custom_nuget.py'
137-
arguments: '--nuspec_path "$(Build.BinariesDirectory)/${{ parameters.PackageName }}.nuspec" --root_dir "$(Build.SourcesDirectory)" --commit_id "$(Build.SourceVersion)" --win_arm64 "$(win_arm64)" --win_x64 "$(win_x64)" --osx_arm64 "$(osx_arm64)" --osx_x64 "$(osx_x64)" --package_version "$(package_version)" --package_name "${{ parameters.PackageName }}"'
136+
arguments: '--nuspec_path "$(Build.BinariesDirectory)/${{ parameters.PackageName }}.nuspec" --root_dir "$(Build.SourcesDirectory)" --commit_id "$(Build.SourceVersion)" --win_arm64 "$(win_arm64)" --win_x64 "$(win_x64)" --osx_arm64 "$(osx_arm64)" --package_version "$(package_version)" --package_name "${{ parameters.PackageName }}"'
138137

139138
- task: NuGetCommand@2
140139
displayName: 'Pack Nuget Package'
@@ -147,4 +146,4 @@ stages:
147146
parameters:
148147
DisplayName: 'ESRP - sign NuGet package'
149148
FolderPath: '$(Build.ArtifactStagingDirectory)'
150-
DoEsrp: true
149+
DoEsrp: ${{ parameters.DoEsrp }}

tools/nuget/generate_nuspec_for_custom_nuget.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ def generate_files(lines, args):
1414
platform_map = {
1515
"win-arm64": args.win_arm64,
1616
"win-x64": args.win_x64,
17-
"osx-x64": args.osx_x64,
1817
"osx-arm64": args.osx_arm64,
1918
}
2019

@@ -116,7 +115,6 @@ def parse_arguments():
116115
parser.add_argument("--win_arm64", required=True, help="Ort win-arm64 directory")
117116
parser.add_argument("--win_x64", required=True, help="Ort win-x64 directory")
118117
parser.add_argument("--osx_arm64", required=True, help="Ort osx-arm64 directory")
119-
parser.add_argument("--osx_x64", required=True, help="Ort osx-x64 directory")
120118
parser.add_argument("--package_version", required=True, help="Version of the package")
121119
parser.add_argument("--package_name", required=True, help="Name of the package")
122120

0 commit comments

Comments
 (0)