Skip to content
New issue

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

#

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

Already on GitHub? # to your account

[DevOps] Rename the yaml-tempaltes resources to match the MAUI repo. #7533

Merged
merged 3 commits into from
Nov 8, 2022
Merged

[DevOps] Rename the yaml-tempaltes resources to match the MAUI repo. #7533

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
332377e
[DevOps] Rename the yaml-tempaltes resources to match the MAUI repo.
mandel-macaque Nov 7, 2022
91c5da9
Pass the correct repo to the templates.
mandel-macaque Nov 7, 2022
ebf6bd1
Change name as per reviews.
mandel-macaque Nov 7, 2022
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
2 changes: 1 addition & 1 deletion build-tools/automation/azure-pipelines-nightly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ pr:
# External sources, scripts, tests, and yaml template files.
resources:
repositories:
- repository: yaml
- repository: xamarin-templates
Copy link
Member

@pjcollins pjcollins Nov 7, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we are working to standardize this name across repos, should we use the repo name yaml-templates everywhere instead of xamarin-templates? I wonder if the latter name might get confused with https://github.com/xamarin/xamarin-templates.

type: github
name: xamarin/yaml-templates
ref: refs/heads/main
Expand Down
30 changes: 15 additions & 15 deletions build-tools/automation/azure-pipelines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ trigger:
# External sources, scripts, tests, and yaml template files.
resources:
repositories:
- repository: yaml
- repository: xamarin-templates
type: github
name: xamarin/yaml-templates
ref: refs/heads/main
Expand Down Expand Up @@ -1246,11 +1246,11 @@ stages:
jdkTestFolder: $(JAVA_HOME_8_X64)
provisionatorChannel: ${{ parameters.provisionatorChannel }}

- template: designer/android-designer-build-mac.yaml@yaml
- template: designer/android-designer-build-mac.yaml@xamarin-templates
parameters:
designerSourcePath: $(System.DefaultWorkingDirectory)/UITools/Designer

- template: designer/android-designer-tests.yaml@yaml
- template: designer/android-designer-tests.yaml@xamarin-templates
parameters:
designerSourcePath: $(System.DefaultWorkingDirectory)/UITools/Designer
runAddinTests: false
Expand Down Expand Up @@ -1428,7 +1428,7 @@ stages:
condition: and(eq(dependencies.mac_build.result, 'Succeeded'), eq(dependencies.linux_build.result, 'Succeeded'), eq(variables['MicroBuildSignType'], 'Real'))
jobs:
# Check - "Xamarin.Android (Prepare .NET Release Sign Archives)"
- template: sign-artifacts/jobs/v2.yml@yaml
- template: sign-artifacts/jobs/v2.yml@xamarin-templates
parameters:
name: sign_net_mac_win
poolName: $(VSEngMicroBuildPool)
Expand All @@ -1438,7 +1438,7 @@ stages:
usePipelineArtifactTasks: true

# Check - "Xamarin.Android (Prepare .NET Release Sign Linux Archive)"
- template: sign-artifacts/jobs/v2.yml@yaml
- template: sign-artifacts/jobs/v2.yml@xamarin-templates
parameters:
name: sign_net_linux
displayName: Sign Linux Archive
Expand All @@ -1449,9 +1449,9 @@ stages:
usePipelineArtifactTasks: true

# Check - "Xamarin.Android (Prepare .NET Release Convert NuGet to MSI)"
- template: nuget-msi-convert/job/v3.yml@yaml
- template: nuget-msi-convert/job/v3.yml@xamarin-templates
parameters:
yamlResourceName: yaml
yamlResourceName: xamarin-templates
dependsOn: sign_net_mac_win
artifactName: nuget-signed
artifactPatterns: |
Expand Down Expand Up @@ -1526,7 +1526,7 @@ stages:
blobName: $(NupkgCommitStatusName)
packagePrefix: xamarin-android
artifactsPath: $(Build.StagingDirectory)\nuget-signed
yamlResourceName: yaml
yamlResourceName: xamarin-templates

- template: templates\common\upload-vs-insertion-artifacts.yml@sdk-insertions
parameters:
Expand All @@ -1535,7 +1535,7 @@ stages:
blobName: $(VSDropCommitStatusName)
packagePrefix: xamarin-android
artifactsPath: $(Build.StagingDirectory)\$(VSDropCommitStatusName)
yamlResourceName: yaml
yamlResourceName: xamarin-templates
downloadSteps:
- task: DownloadPipelineArtifact@2
inputs:
Expand All @@ -1549,7 +1549,7 @@ stages:
blobName: $(MultiTargetVSDropCommitStatusName)
packagePrefix: xamarin-android
artifactsPath: $(Build.StagingDirectory)\$(MultiTargetVSDropCommitStatusName)
yamlResourceName: yaml
yamlResourceName: xamarin-templates
downloadSteps:
- task: DownloadPipelineArtifact@2
inputs:
Expand Down Expand Up @@ -1584,7 +1584,7 @@ stages:
# .NET 6 VS Insertion Stage
# Check - "Xamarin.Android (VS Insertion - Wait For Approval)"
# Check - "Xamarin.Android (VS Insertion - Create VS Drop and Open PR)"
- template: vs-insertion/stage/v1.yml@yaml
- template: vs-insertion/stage/v1.yml@xamarin-templates
parameters:
dependsOn: dotnet_prepare_release
symbolArtifactName: nuget-signed
Expand Down Expand Up @@ -1820,7 +1820,7 @@ stages:
- script: xcrun stapler validate $(XA.Unsigned.Pkg)
displayName: validate notarized pkg

- template: upload-to-storage.yml@yaml
- template: upload-to-storage.yml@xamarin-templates
parameters:
BuildPackages: $(System.DefaultWorkingDirectory)/storage-artifacts
AzureContainerName: $(Azure.Container.Name)
Expand All @@ -1842,7 +1842,7 @@ stages:
- finalize_installers
condition: and(eq(variables['MicroBuildSignType'], 'Real'), eq(dependencies.dotnet_prepare_release.result, 'Succeeded'), eq(dependencies.finalize_installers.result, 'Succeeded'))
jobs:
- template: compliance/sbom/job.v1.yml@yaml
- template: compliance/sbom/job.v1.yml@xamarin-templates
parameters:
artifactNames: [ nuget-signed, nuget-linux-signed, vs-msi-nugets, vsdrop-signed ]
statusContexts: [ 'vsts-devdiv artifacts' ]
Expand All @@ -1865,11 +1865,11 @@ stages:
- checkout: self
submodules: recursive

- template: security\credscan\v2.yml@yaml
- template: security\credscan\v2.yml@xamarin-templates
parameters:
suppressionsFile: $(System.DefaultWorkingDirectory)\build-tools\automation\CredScanSuppressions.json

- template: security\policheck\v1.yml@yaml
- template: security\policheck\v1.yml@xamarin-templates
parameters:
exclusionFile: $(System.DefaultWorkingDirectory)\build-tools\automation\PoliCheckExclusions.xml
pE: 1|2|3|4
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/install-microbuild-tooling.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ steps:
condition: ${{ parameters.condition }}

# ESRP signing requires minimum azure client version 2.8.0
- template: azure-tools/az-client-update.yml@yaml
- template: azure-tools/az-client-update.yml@xamarin-templates
parameters:
version: '2.8.0'
condition: and(${{ parameters.condition }}, eq(variables['agent.os'], 'Darwin'))
Expand Down
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/update-vs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ steps:
provisioning_extra_args: -vv
condition: ${{ parameters.condition }}

- template: environment/win/vs-msbuild.v1.yml@yaml # Display (in log) VS installation(s) including installation status with associated MSBuild location(s)
- template: environment/win/vs-msbuild.v1.yml@xamarin-templates # Display (in log) VS installation(s) including installation status with associated MSBuild location(s)
parameters:
condition: ${{ parameters.condition }}