Skip to content

Commit

Permalink
Also making release-dev 1ES compliant
Browse files Browse the repository at this point in the history
  • Loading branch information
jchen351 committed Feb 21, 2025
1 parent b1d23b2 commit f297601
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 22 deletions.
27 changes: 23 additions & 4 deletions .azure-pipelines/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,28 @@
# To configure triggers, see https://github.com/microsoft/onnx-converters-private/wiki/ONNX-Script-release
trigger: none

pool:
vmImage: ubuntu-latest
variables:
CI: 'true'
steps:
- template: stages/_release-template-stage.yml

resources:
repositories:
- repository: 1esPipelines
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

extends:
# The pipeline extends the 1ES PT which will inject different SDL and compliance tasks.
# For non-production pipelines, use "Unofficial" as defined below.
# For productions pipelines, use "Official".
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
parameters:
sdl:
sourceAnalysisPool:
name: onnxruntime-Win-CPU-2022
os: windows
pool:
name: 'onnxruntime-Ubuntu2204-AMD-CPU'
os: 'linux'
steps:
- template: stages/_release-template-stage.yml
1 change: 1 addition & 0 deletions .azure-pipelines/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ resources:
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release

extends:
# The pipeline extends the 1ES PT which will inject different SDL and compliance tasks.
# For non-production pipelines, use "Unofficial" as defined below.
Expand Down
21 changes: 5 additions & 16 deletions .azure-pipelines/stages/_release-template-stage.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
parameters:
- name: is1ES
displayName: 'Is 1ES pipeline'
type: boolean
default: false
steps:
- task: UsePythonVersion@0
inputs:
Expand All @@ -18,14 +13,8 @@ steps:
SourceFolder: 'dist'
Contents: '*.*'
TargetFolder: '$(Build.ArtifactStagingDirectory)'
- ${{ if eq(parameters.is1ES, false) }}:
- task: PublishPipelineArtifact@1
displayName: 'Publish Python Wheel'
inputs:
ArtifactName: 'onnxscript'
- ${{ if eq(parameters.is1ES, true) }}:
- task: 1ES.PublishPipelineArtifact@1
displayName: 'Publish Python Wheel'
inputs:
ArtifactName: 'onnxscript'
targetPath: '$(Build.ArtifactStagingDirectory)'
- task: 1ES.PublishPipelineArtifact@1
displayName: 'Publish Python Wheel'
inputs:
ArtifactName: 'onnxscript'
targetPath: '$(Build.ArtifactStagingDirectory)'
2 changes: 0 additions & 2 deletions .azure-pipelines/stages/release_stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ stages:
- job: Job
steps:
- template: _release-template-stage.yml
parameters:
is1ES: true
# Test the wheels. This needs to happen after PublishBuildArtifacts
# to avoid interference with the artifacts
- script: python -m pip install dist/*.whl --no-deps
Expand Down

0 comments on commit f297601

Please sign in to comment.