Skip to content

Commit

Permalink
[ci] Do not use @self annotation for templates (#8783)
Browse files Browse the repository at this point in the history
The `@self` yaml template annotation only appears to be needed in the
pipeline file, and not in nested templates.  This should fix potential
issues with other repos that use these templates.
  • Loading branch information
pjcollins authored Mar 4, 2024
1 parent a1c5111 commit 5cd9a26
Show file tree
Hide file tree
Showing 13 changed files with 53 additions and 53 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ parameters:
retryCountOnTaskFailure: 1

steps:
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
parameters:
configuration: ${{ parameters.buildConfiguration }}
xaSourcePath: ${{ parameters.xaSourcePath }}
Expand Down
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/build-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ stages:
artifactName: ${{ parameters.nugetArtifactName }}
targetPath: $(System.DefaultWorkingDirectory)/xamarin-android/bin/Build$(XA.Build.Configuration)/nuget-linux

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
xaSourcePath: $(System.DefaultWorkingDirectory)/xamarin-android
artifactName: ${{ parameters.buildResultArtifactName }}
includeBuildResults: true
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
4 changes: 2 additions & 2 deletions build-tools/automation/yaml-templates/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ stages:
path: ${{ parameters.checkoutPath }}
persistCredentials: ${{ parameters.checkoutPersistCredentials }}

- template: /build-tools/automation/yaml-templates/commercial-build.yaml@self
- template: /build-tools/automation/yaml-templates/commercial-build.yaml
parameters:
xaSourcePath: ${{ parameters.xaSourcePath }}
installerArtifactName: ${{ parameters.installerArtifactName }}
Expand All @@ -78,7 +78,7 @@ stages:
windowsToolchainPdbArtifactName: ${{ parameters.windowsToolchainPdbArtifactName }}
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
xaSourcePath: ${{ parameters.xaSourcePath }}
artifactName: ${{ parameters.buildResultArtifactName }}
Expand Down
16 changes: 8 additions & 8 deletions build-tools/automation/yaml-templates/build-windows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ stages:
path: ${{ parameters.checkoutPath }}
persistCredentials: ${{ parameters.checkoutPersistCredentials }}

- template: /build-tools/automation/yaml-templates/kill-processes.yaml@self
- template: /build-tools/automation/yaml-templates/kill-processes.yaml

- template: /build-tools/automation/yaml-templates/clean.yaml@self
- template: /build-tools/automation/yaml-templates/clean.yaml

- script: |
echo ##vso[task.setvariable variable=JI_JAVA_HOME]%JAVA_HOME_17_X64%
displayName: set JI_JAVA_HOME to $(JAVA_HOME_17_X64)
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
parameters:
remove_dotnet: true

Expand All @@ -54,7 +54,7 @@ stages:
arguments: '-c $(XA.Build.Configuration) -t:Prepare --no-restore -p:AutoProvision=true -bl:$(System.DefaultWorkingDirectory)\bin\Build$(XA.Build.Configuration)\dotnet-build-prepare.binlog'

# Build, pack .nupkgs, and extract workload packs to dotnet preview test directory
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml@self
- template: /build-tools/automation/yaml-templates/run-dotnet-preview.yaml
parameters:
project: Xamarin.Android.sln
arguments: >-
Expand All @@ -63,12 +63,12 @@ stages:
displayName: Build Solution
continueOnError: false

- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml@self
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml
parameters:
toolName: apkdiff
version: $(ApkDiffToolVersion)

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: Smoke MSBuild Tests - Windows Dotnet Build
testAssembly: $(System.DefaultWorkingDirectory)\bin\Test$(XA.Build.Configuration)\$(DotNetStableTargetFramework)\Xamarin.Android.Build.Tests.dll
Expand All @@ -80,9 +80,9 @@ stages:
filename: dotnet-local.cmd
arguments: build samples\HelloWorld\HelloWorld\HelloWorld.DotNet.csproj

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
artifactName: ${{ parameters.buildResultArtifactName }}
includeBuildResults: true

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
6 changes: 3 additions & 3 deletions build-tools/automation/yaml-templates/commercial-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ steps:
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
displayName: set JI_JAVA_HOME

- template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
parameters:
remove_dotnet: true

Expand Down Expand Up @@ -66,7 +66,7 @@ steps:
displayName: CodeQL 3000 Finalize
condition: and(succeededOrFailed(), eq(variables['Codeql.Enabled'], 'true'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))

- template: /build-tools/automation/yaml-templates/install-microbuild-tooling.yaml@self
- template: /build-tools/automation/yaml-templates/install-microbuild-tooling.yaml
parameters:
condition: and(succeeded(), eq(variables['MicroBuildSignType'], 'Real'))

Expand Down Expand Up @@ -115,7 +115,7 @@ steps:
/p:MicroBuildOverridePluginDirectory=$(Build.StagingDirectory)/MicroBuild/Plugins
/bl:${{ parameters.xaSourcePath }}/bin/Build$(XA.Build.Configuration)/sign-bu-ex.binlog
- template: /build-tools/automation/yaml-templates/remove-microbuild-tooling.yaml@self
- template: /build-tools/automation/yaml-templates/remove-microbuild-tooling.yaml
parameters:
condition: and(succeededOrFailed(), eq(variables['MicroBuildSignType'], 'Real'))

Expand Down
8 changes: 4 additions & 4 deletions build-tools/automation/yaml-templates/run-emulator-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
echo "##vso[task.setvariable variable=JAVA_HOME]${{ parameters.jdkTestFolder }}"
displayName: set JAVA_HOME to ${{ parameters.jdkTestFolder }}
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
xaprepareScenario: EmulatorTestDependencies
jdkTestFolder: ${{ parameters.jdkTestFolder }}
Expand All @@ -36,15 +36,15 @@ jobs:
artifactName: $(TestAssembliesArtifactName)
downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)

- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml@self
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml
parameters:
emulatorMSBuildArgs: ${{ parameters.emulatorMSBuildArgs }}

- ${{ parameters.testSteps }}

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
artifactName: Test Results - ${{ parameters.jobName }} With Emulator - macOS
use1ESTemplate: ${{ parameters.use1ESTemplate }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
12 changes: 6 additions & 6 deletions build-tools/automation/yaml-templates/run-msbuild-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
- ${{ if eq(parameters.testOS, 'Windows') }}:
- script: netsh int ipv4 set global sourceroutingbehavior=drop

- template: /build-tools/automation/yaml-templates/kill-processes.yaml@self
- template: /build-tools/automation/yaml-templates/kill-processes.yaml

- template: /build-tools/automation/yaml-templates/clean.yaml@self
- template: /build-tools/automation/yaml-templates/clean.yaml

- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
installLegacyXamarinAndroid: true
Expand All @@ -47,19 +47,19 @@ jobs:
artifactName: $(TestAssembliesArtifactName)
downloadPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Build.Tests.dll
testFilter: ${{ parameters.testFilter }}
testRunTitle: Xamarin.Android.Build.Tests - ${{ parameters.testOS }}
retryFailedTests: false
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
artifactName: Test Results - MSBuild - ${{ parameters.testOS }}-$(System.JobPositionInPhase)
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
condition: ${{ parameters.shouldFailOnIssue }}
2 changes: 1 addition & 1 deletion build-tools/automation/yaml-templates/run-nunit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ steps:
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }}

- template: /build-tools/automation/yaml-templates/kill-processes.yaml@self
- template: /build-tools/automation/yaml-templates/kill-processes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ steps:
- ${{ if eq(parameters.retryFailedTests, 'false') }}:
# If we aren't using auto-retry logic, then this is just a simple template call
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: ${{ parameters.testRunTitle }}-$(System.JobPositionInPhase)
testAssembly: ${{ parameters.testAssembly }}
Expand Down Expand Up @@ -70,7 +70,7 @@ steps:
custom: build-server
arguments: shutdown

- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-nunit-tests.yaml
parameters:
testRunTitle: ${{ parameters.testRunTitle }}-$(System.JobPositionInPhase) (Auto-Retry)
testAssembly: ${{ parameters.testAssembly }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ steps:

# Install .NET 6 for legacy tests
- ${{ if eq(parameters.installLegacyDotNet, true) }}:
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml
parameters:
version: 6.0
quality: GA
remove_dotnet: ${{ parameters.remove_dotnet }}

# Install latest .NET
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml@self
- template: /build-tools/automation/yaml-templates/use-dot-net.yaml

- task: DotNetCoreCLI@2
displayName: shut down existing build daemons
Expand All @@ -52,23 +52,23 @@ steps:
arguments: shutdown

- ${{ if eq(parameters.updateMono, true) }}:
- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml@self
- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
parameters:
displayName: run xaprepare-UpdateMono
arguments: --s=UpdateMono --auto-provision=yes --auto-provision-uses-sudo=yes
condition: and(succeeded(), eq(variables['agent.os'], 'Darwin'))
xaSourcePath: ${{ parameters.xaSourcePath }}

- ${{ if eq(parameters.installLegacyXamarinAndroid, true) }}:
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml@self
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml
parameters:
toolName: boots
version: $(BootsToolVersion)
continueOnError: false
- pwsh: $(Agent.ToolsDirectory)/boots --stable Xamarin.Android
displayName: install Xamarin.Android stable

- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml@self
- template: /build-tools/automation/yaml-templates/run-xaprepare.yaml
parameters:
arguments: --s=${{ parameters.xaprepareScenario }} --android-sdk-platforms="${{ parameters.androidSdkPlatforms }}"
xaSourcePath: ${{ parameters.xaSourcePath }}
Expand Down Expand Up @@ -98,13 +98,13 @@ steps:
arguments: -t:ExtractWorkloadPacks -c ${{ parameters.configuration }} -v:n -bl:${{ parameters.xaSourcePath }}/bin/Test${{ parameters.configuration }}/extract-workloads.binlog

- ${{ if eq(parameters.installApkDiff, true) }}:
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml@self
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml
parameters:
toolName: apkdiff
version: $(ApkDiffToolVersion)

- ${{ if eq(parameters.installTestSlicer, true) }}:
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml@self
- template: /build-tools/automation/yaml-templates/install-dotnet-tool.yaml
parameters:
toolName: dotnet-test-slicer
version: $(TestSlicerToolVersion)
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stages:
workspace:
clean: all
steps:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
installApkDiff: false
Expand All @@ -49,29 +49,29 @@ stages:
artifactName: $(TestAssembliesArtifactName)
downloadPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)

- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml@self
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml
parameters:
xaSourcePath: ${{ parameters.xaSourcePath }}
startContinueOnError: ${{ parameters.emulatorStartContinueOnError }}

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testFilter: $(ExcludedNightlyNUnitCategories)
testRunTitle: MSBuildDeviceIntegration On Device - macOS

- ${{ if ne(parameters.usesCleanImages, true) }}:
- template: start-stop-emulator.yaml@self
- template: start-stop-emulator.yaml
parameters:
command: stop
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
artifactName: Test Results - MSBuild With Emulator - macOS-$(System.JobPositionInPhase)
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
condition: ${{ parameters.shouldFailOnIssue }}

Expand All @@ -94,7 +94,7 @@ stages:
workspace:
clean: all
steps:
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml@self
- template: /build-tools/automation/yaml-templates/setup-test-environment.yaml
parameters:
installTestSlicer: true
installApkDiff: false
Expand All @@ -108,7 +108,7 @@ stages:
artifactName: $(TestAssembliesArtifactName)
downloadPath: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)

- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml@self
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml
parameters:
specificImage: true
deviceName: $(deviceName)
Expand All @@ -118,15 +118,15 @@ stages:
xaSourcePath: ${{ parameters.xaSourcePath }}
startContinueOnError: ${{ parameters.emulatorStartContinueOnError }}

- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-sliced-nunit-tests.yaml
parameters:
testRunTitle: WearOS On Device - macOS
testAssembly: ${{ parameters.xaSourcePath }}/bin/Test$(XA.Build.Configuration)/MSBuildDeviceIntegration/$(DotNetStableTargetFramework)/MSBuildDeviceIntegration.dll
testFilter: cat = WearOS
xaSourcePath: ${{ parameters.xaSourcePath }}

- ${{ if ne(parameters.usesCleanImages, true) }}:
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml@self
- template: /build-tools/automation/yaml-templates/start-stop-emulator.yaml
parameters:
command: stop
specificImage: true
Expand All @@ -136,12 +136,12 @@ stages:
avdType: $(avdType)
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/upload-results.yaml@self
- template: /build-tools/automation/yaml-templates/upload-results.yaml
parameters:
configuration: $(XA.Build.Configuration)
artifactName: Test Results - Emulator $(avdApiLevel)-$(avdAbi)-$(avdType) - macOS
xaSourcePath: ${{ parameters.xaSourcePath }}

- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml@self
- template: /build-tools/automation/yaml-templates/fail-on-issue.yaml
parameters:
condition: ${{ parameters.shouldFailOnIssue }}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ stages:
dependsOn: ${{ parameters.dependsOn }}
condition: ${{ parameters.stageCondition }}
jobs:
- template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
parameters:
testOS: macOS
jobName: mac_msbuild_tests
Expand All @@ -27,7 +27,7 @@ stages:
commit: ${{ parameters.commit }}
shouldFailOnIssue: ${{ parameters.shouldFailOnIssue }}

- template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml@self
- template: /build-tools/automation/yaml-templates/run-msbuild-tests.yaml
parameters:
testOS: Windows
jobName: win_msbuild_tests
Expand Down
Loading

0 comments on commit 5cd9a26

Please sign in to comment.