Skip to content

Make logical template name consistent between pipelines #25990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 5 commits into from
Sep 5, 2025
+17 −17
Merged

Make logical template name consistent between pipelines #25990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d8b622b
Update repository reference in PowerShell-Packages-Official.yml
TravisEz13 Sep 5, 2025
50f7921
Update pipeline templates and naming conventions for consistency
TravisEz13 Sep 5, 2025
d7a73bc
Merge branch 'master' into fix-package-pipeline
TravisEz13 Sep 5, 2025
7841bbf
Update template references in PowerShell-vPack pipeline for consistency
TravisEz13 Sep 5, 2025
f0754de
Merge branch 'fix-package-pipeline' of https://github.com/travisez13/…
TravisEz13 Sep 5, 2025
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
4 changes: 2 additions & 2 deletions .pipelines/MSIXBundle-vPack-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ variables:

resources:
repositories:
- repository: templates
- repository: onebranchTemplates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
Expand All @@ -44,7 +44,7 @@ resources:
- releases/*

extends:
template: v2/Microsoft.Official.yml@templates
template: v2/Microsoft.Official.yml@onebranchTemplates
parameters:
platform:
name: 'windows_undocked' # windows undocked
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/PowerShell-Coordinated_Packages-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
name: bins-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
trigger: none

parameters:
Expand Down Expand Up @@ -34,6 +33,7 @@ parameters:
type: boolean
default: false

name: bins-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)

resources:
repositories:
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/PowerShell-Packages-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
type: boolean
default: false

name: pkgs-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
name: pkgs-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)

variables:
- name: CDP_DEFINITION_BUILD_COUNT
Expand Down Expand Up @@ -78,7 +78,7 @@ resources:
- releases/*

repositories:
- repository: templates
- repository: onebranchTemplates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/PowerShell-Release-Official-Azure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
type: boolean
default: false

name: ev2-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
name: ev2-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)

variables:
- name: CDP_DEFINITION_BUILD_COUNT
Expand Down Expand Up @@ -54,7 +54,7 @@ variables:

resources:
repositories:
- repository: templates
- repository: onebranchTemplates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
Expand Down
16 changes: 8 additions & 8 deletions .pipelines/PowerShell-Release-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parameters: # parameters are shown up in ADO UI in a build queue time
type: boolean
default: false

name: release-$(BUILD.SOURCEBRANCHNAME)-$(Build.BuildId)
name: release-$(BUILD.SOURCEBRANCHNAME)-prod.${{ parameters.OfficialBuild }}-$(Build.BuildId)

variables:
- name: CDP_DEFINITION_BUILD_COUNT
Expand Down Expand Up @@ -71,7 +71,7 @@ variables:

resources:
repositories:
- repository: templates
- repository: onebranchTemplates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
Expand All @@ -95,7 +95,7 @@ resources:
extends:
template: ${{ variables.templateFile }}
parameters:
release:
release:
category: NonAzure
featureFlags:
WindowsHostVersion:
Expand Down Expand Up @@ -303,19 +303,19 @@ extends:
displayName: Push Git Tag
jobName: PushGitTag
instructions: |
Push the git tag to upstream
Push the git tag to upstream

- template: /.pipelines/templates/approvalJob.yml@self
parameters:
displayName: Make Draft Public
dependsOnJob: PushGitTag
jobName: DraftPublic
instructions: |
Make the GitHub Release Draft Public

- stage: BlobPublic
displayName: Make Blob Public
dependsOn:
dependsOn:
- UpdateChangeLog
- PushGitTagAndMakeDraftPublic
jobs:
Expand Down Expand Up @@ -426,7 +426,7 @@ extends:

- stage: ReleaseClose
displayName: Finish Release
dependsOn:
dependsOn:
- ReleaseToMU
- ReleaseSymbols
jobs:
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/PowerShell-vPack-Official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ variables:
- group: Azure Blob variable group
- group: certificate_logical_to_actual # used within signing task
- name: templateFile
value: ${{ iif ( parameters.OfficialBuild, 'v2/Microsoft.Official.yml@templates', 'v2/Microsoft.NonOfficial.yml@templates' ) }}
value: ${{ iif ( parameters.OfficialBuild, 'v2/Microsoft.Official.yml@onebranchTemplates', 'v2/Microsoft.NonOfficial.yml@onebranchTemplates' ) }}
- group: DotNetPrivateBuildAccess
- group: certificate_logical_to_actual
# We shouldn't be using PATs anymore
# - group: mscodehub-feed-read-general

resources:
repositories:
- repository: templates
- repository: onebranchTemplates
type: git
name: OneBranch.Pipelines/GovernedTemplates
ref: refs/heads/main
Expand Down