Skip to content

Commit 5e9b423

Browse files
authored
Fix packaging pipeline for nightly builds (#15839)
1 parent 2735e0d commit 5e9b423

File tree

1 file changed

+19
-6
lines changed

1 file changed

+19
-6
lines changed

tools/ci_build/github/azure-pipelines/c-api-noopenmp-packaging-pipelines.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,30 +51,43 @@ resources:
5151
name: pypa/manylinux
5252
ref: aead4d751c2101e23336aa73f2380df83e7a13f3
5353

54+
variables:
55+
- name: ReleaseVersionSuffix
56+
value: ''
57+
5458
stages:
5559
- stage: Set_release_version_suffix
5660
jobs:
5761
- job:
5862
steps:
63+
- checkout: none
5964
- bash: |
6065
if [[ "${{ parameters.IsReleaseBuild }}" = True && "${{ parameters.PreReleaseVersionSuffixString }}" != "none" ]]; then
61-
echo "##vso[task.setvariable variable=ReleaseVersionSuffix;]${{ parameters.PreReleaseVersionSuffixString }}.${{ parameters.PreReleaseVersionSuffixNumber }}"
66+
echo "##vso[task.setvariable variable=ReleaseVersionSuffix; isoutput=true]${{ parameters.PreReleaseVersionSuffixString }}.${{ parameters.PreReleaseVersionSuffixNumber }}"
6267
else
63-
echo "##vso[task.setvariable variable=ReleaseVersionSuffix;]''"
68+
echo "##vso[task.setvariable variable=ReleaseVersionSuffix; isoutput=true]''"
6469
fi
6570
- bash: |
6671
echo "IsReleaseBuild is: ${{ parameters.IsReleaseBuild }}"
6772
echo "Pre-release version suffix is: ${{ parameters.PreReleaseVersionSuffixString }}"
6873
echo "Pre-release version number is: ${{ parameters.PreReleaseVersionSuffixNumber }}"
6974
echo "Release version suffix is: $(ReleaseVersionSuffix)"
7075
76+
- stage: Debug
77+
jobs:
78+
- job:
79+
steps:
80+
- checkout: none
81+
- bash: |
82+
echo "Release version suffix is: $(ReleaseVersionSuffix)"
83+
7184
- template: templates/c-api-cpu.yml
7285
parameters:
7386
RunOnnxRuntimeTests: ${{ parameters.RunOnnxRuntimeTests }}
7487
DoCompliance: ${{ parameters.DoCompliance }}
7588
DoEsrp: ${{ parameters.DoEsrp }}
7689
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
77-
ReleaseVersionSuffix: ${ReleaseVersionSuffix}
90+
ReleaseVersionSuffix: $(ReleaseVersionSuffix)
7891
OrtNugetPackageId: 'Microsoft.ML.OnnxRuntime'
7992
AdditionalBuildFlags: ''
8093
AdditionalWinBuildFlags: '--enable_onnx_tests --enable_wcos'
@@ -607,7 +620,7 @@ stages:
607620
#
608621
# 'Any CPU' is the default (first 'mixed' platform specified in the csproj) so this should be fine.
609622
script: |
610-
dotnet build .\src\Microsoft.ML.OnnxRuntime\Microsoft.ML.OnnxRuntime.csproj -p:SelectedTargets=Net6 -p:Configuration=RelWithDebInfo -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId="Microsoft.ML.OnnxRuntime.Gpu" -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=${ReleaseVersionSuffix}
623+
dotnet build .\src\Microsoft.ML.OnnxRuntime\Microsoft.ML.OnnxRuntime.csproj -p:SelectedTargets=Net6 -p:Configuration=RelWithDebInfo -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId="Microsoft.ML.OnnxRuntime.Gpu" -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=$(ReleaseVersionSuffix)
611624
workingDirectory: '$(Build.SourcesDirectory)\csharp'
612625

613626
- task: MSBuild@1
@@ -625,7 +638,7 @@ stages:
625638
solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.sln'
626639
configuration: RelWithDebInfo
627640
platform: 'Any CPU'
628-
msbuildArguments: '-p:SelectedTargets=PreNet6 -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId="Microsoft.ML.OnnxRuntime.Gpu" -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=${ReleaseVersionSuffix}'
641+
msbuildArguments: '-p:SelectedTargets=PreNet6 -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId="Microsoft.ML.OnnxRuntime.Gpu" -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=$(ReleaseVersionSuffix)'
629642
workingDirectory: '$(Build.SourcesDirectory)\csharp'
630643

631644
- template: templates/win-esrp-dll.yml
@@ -649,7 +662,7 @@ stages:
649662
solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj'
650663
configuration: RelWithDebInfo
651664
platform: 'Any CPU'
652-
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=Microsoft.ML.OnnxRuntime.Gpu -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=${ReleaseVersionSuffix}'
665+
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=Microsoft.ML.OnnxRuntime.Gpu -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=$(ReleaseVersionSuffix)'
653666
workingDirectory: '$(Build.SourcesDirectory)\csharp'
654667

655668
- task: BatchScript@1

0 commit comments

Comments
 (0)