Skip to content

Commit 06da217

Browse files
RyAuldCopilot
andcommitted
merge dev and address PR feedback
- Resolve merge conflict (keep OneBranch rewrite, ESRP fix unchanged) - Remove packageVersion default to force explicit input on each release - Pin vmImage to ubuntu-22.04 for reproducibility Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents f6d8ebd + 6b652f4 commit 06da217

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

.Pipelines/pipeline-publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ parameters:
1515
- name: packageVersion
1616
displayName: 'Package version to publish (must match msal/sku.py, e.g. 1.36.0 or 1.36.0rc1)'
1717
type: string
18-
default: '1.37.0'
18+
default: ' '
1919

2020
- name: publishTarget
2121
displayName: 'Publish target'
@@ -80,7 +80,7 @@ extends:
8080
pool:
8181
type: linux
8282
isCustom: true
83-
vmImage: 'ubuntu-latest'
83+
vmImage: 'ubuntu-22.04'
8484
variables:
8585
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
8686
steps:
@@ -122,7 +122,7 @@ extends:
122122
pool:
123123
type: linux
124124
isCustom: true
125-
vmImage: 'ubuntu-latest'
125+
vmImage: 'ubuntu-22.04'
126126
variables:
127127
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
128128
steps:

.Pipelines/template-pipeline-stages.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ stages:
4343
pool:
4444
type: linux
4545
isCustom: true
46-
vmImage: 'ubuntu-latest'
46+
vmImage: 'ubuntu-22.04'
4747
variables:
4848
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
4949
steps:
@@ -88,7 +88,7 @@ stages:
8888
pool:
8989
type: linux
9090
isCustom: true
91-
vmImage: 'ubuntu-latest'
91+
vmImage: 'ubuntu-22.04'
9292
timeoutInMinutes: 30
9393
variables:
9494
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
@@ -191,7 +191,7 @@ stages:
191191
pool:
192192
type: linux
193193
isCustom: true
194-
vmImage: 'ubuntu-latest'
194+
vmImage: 'ubuntu-22.04'
195195
timeoutInMinutes: 60
196196
variables:
197197
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ extends:
8080
pool:
8181
type: linux
8282
isCustom: true
83-
vmImage: 'ubuntu-latest'
83+
vmImage: 'ubuntu-22.04'
8484
variables:
8585
ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
8686
steps:

0 commit comments

Comments
 (0)