Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,21 @@ parameters:
type: boolean
default: false

- name: PreReleaseVersionSuffixString
displayName: Suffix added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the type of pre-release package.
type: string
values:
- alpha
- beta
- rc
- none
default: none

- name: PreReleaseVersionSuffixNumber
displayName: Number added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the sequence of a pre-release package.
type: number
default: 0

- name: PackageName
displayName: What is the package name? Override using an environment variable CustomPackageName.
type: string
Expand Down Expand Up @@ -69,6 +84,12 @@ extends:
exclusionsFile: '$(Build.SourcesDirectory)\tools\ci_build\policheck_exclusions.xml'

stages:
- template: stages/set_packaging_variables_stage.yml
parameters:
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
PreReleaseVersionSuffixString: ${{ parameters.PreReleaseVersionSuffixString }}
PreReleaseVersionSuffixNumber: ${{ parameters.PreReleaseVersionSuffixNumber }}

- template: templates/win-ci.yml
parameters:
ort_build_pool_name: 'onnxruntime-Win2022-GPU-A10'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,22 @@ parameters:
type: boolean
default: false


- name: PreReleaseVersionSuffixString
displayName: Suffix added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the type of pre-release package.
type: string
values:
- alpha
- beta
- rc
- none
default: none

- name: PreReleaseVersionSuffixNumber
displayName: Number added to pre-release package version. Only used if IsReleaseBuild is true. Denotes the sequence of a pre-release package.
type: number
default: 0

- name: DoEsrp
displayName: Run code sign tasks? Must be true if you are doing an Onnx Runtime release.
type: boolean
Expand Down Expand Up @@ -68,6 +84,11 @@ extends:
enabled: true
exclusionsFile: '$(Build.SourcesDirectory)\tools\ci_build\policheck_exclusions.xml'
stages:
- template: stages/set_packaging_variables_stage.yml
parameters:
IsReleaseBuild: ${{ parameters.IsReleaseBuild }}
PreReleaseVersionSuffixString: ${{ parameters.PreReleaseVersionSuffixString }}
PreReleaseVersionSuffixNumber: ${{ parameters.PreReleaseVersionSuffixNumber }}

- template: templates/qnn-ep-win.yml
parameters:
Expand Down
13 changes: 10 additions & 3 deletions tools/ci_build/github/azure-pipelines/templates/qnn-ep-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ parameters:

stages:
- stage: ${{ parameters.StageName }}
dependsOn: []
dependsOn:
- Setup
jobs:
- job: ${{ parameters.StageName }}
timeoutInMinutes: 300
Expand Down Expand Up @@ -45,6 +46,7 @@ stages:
artifactName: "drop-signed-nuget-qnn"
variables:
OrtPackageId: ${{ parameters.OrtNugetPackageId }}
ReleaseVersionSuffix: $[stageDependencies.Setup.Set_Variables.outputs['Set_Release_Version_Suffix.ReleaseVersionSuffix']]
commonBuildArgs: '--skip_submodule_sync --build_shared_lib --client_package_build --cmake_generator "Visual Studio 17 2022" --config ${{ parameters.build_config }} --parallel --use_vcpkg --use_vcpkg_ms_internal_asset_cache --use_binskim_compliant_compile_flags '

steps:
Expand Down Expand Up @@ -107,7 +109,12 @@ stages:
solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.DesktopOnly.CSharp.sln'
platform: 'Any CPU'
configuration: ${{ parameters.build_config }}
msbuildArguments: '-p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=$(OrtPackageId) -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}'
msbuildArguments: >
-p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)"
-p:OrtPackageId=$(OrtPackageId)
-p:IsReleaseBuild=${{ parameters.IsReleaseBuild }}
-p:ReleaseVersionSuffix=$(ReleaseVersionSuffix)
-p:PackageVersion=$(OnnxRuntimeVersion)
workingDirectory: '$(Build.SourcesDirectory)\csharp'

- ${{ if eq(parameters.DoEsrp, true) }}:
Expand All @@ -123,7 +130,7 @@ stages:
solution: '$(Build.SourcesDirectory)\csharp\OnnxRuntime.CSharp.proj'
platform: 'Any CPU'
configuration: ${{ parameters.build_config }}
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=$(OrtPackageId) -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:TargetArchitecture=arm64'
msbuildArguments: '-t:CreatePackage -p:OnnxRuntimeBuildDirectory="$(Build.BinariesDirectory)" -p:OrtPackageId=$(OrtPackageId) -p:IsReleaseBuild=${{ parameters.IsReleaseBuild }} -p:ReleaseVersionSuffix=$(ReleaseVersionSuffix) -p:TargetArchitecture=arm64'
workingDirectory: '$(Build.SourcesDirectory)\csharp'

- task: CopyFiles@2
Expand Down
12 changes: 11 additions & 1 deletion tools/python/run_packaging_pipelines.py
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,9 @@ def filter_pipelines(pipelines: list[dict], token: str, branch: str, is_pr_build
if result:
filtered_results.append(result)

print(f"\nFound {len(filtered_results)} pipelines to trigger.")
print(f"\nFound {len(filtered_results)} pipelines to trigger:")
for result in filtered_results:
print(f" - {result['pipeline']['name']}")
return filtered_results


Expand Down Expand Up @@ -453,6 +455,14 @@ def main():
nightly_override = "0"
release_override = "true"

# If pre-release flags are used, it implies a release build.
if args.pre_release_suffix_string:
print("Pre-release suffix provided. Forcing 'release' build mode.")
if args.build_mode and args.build_mode != "release":
print(f"Warning: --build-mode={args.build_mode} is overridden by pre-release flags.")
nightly_override = "0"
release_override = "true"

for result in pipelines_to_trigger:
pipeline = result["pipeline"]
packaging_type = result["packaging_type"]
Expand Down
Loading