Clean up YAML a bit (#2791)

mono · Mar 8, 2024 · 5ec482f · 5ec482f
1 parent 6c0eefa
commit 5ec482f
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 77 deletions.
diff --git a/scripts/azure-pipelines-complete-internal.yml b/scripts/azure-pipelines-complete-internal.yml
@@ -40,7 +40,7 @@ pool:
   vmImage: ubuntu-20.04
 
 variables:
-  - template: azure-pipelines-variables.yml
+  - template: /scripts/azure-pipelines-variables.yml@self
 
 resources:
   repositories:
@@ -51,7 +51,7 @@ resources:
       ref: refs/heads/main
 
 stages:
-  - template: azure-templates-stages.yml
+  - template: /scripts/azure-templates-stages.yml@self
     parameters:
       buildPipelineType: 'both'
       buildExternals: ${{ parameters.buildExternals }}

diff --git a/scripts/azure-pipelines-complete.yml b/scripts/azure-pipelines-complete.yml
@@ -43,10 +43,10 @@ pool:
   vmImage: ubuntu-20.04
 
 variables:
-  - template: azure-pipelines-variables.yml
+  - template: /scripts/azure-pipelines-variables.yml@self
 
 stages:
-  - template: azure-templates-stages.yml
+  - template: /scripts/azure-templates-stages.yml@self
     parameters:
       buildPipelineType: 'both'
       buildExternals: ${{ parameters.buildExternals }}

diff --git a/scripts/azure-pipelines-cve.yml b/scripts/azure-pipelines-cve.yml
@@ -33,7 +33,7 @@ steps:
     displayName: Update the database
     continueOnError: true
 
-  - template: azure-templates-download-artifacts.yml
+  - template: /scripts/azure-templates-download-artifacts.yml@self
     parameters:
       sourceBuildId: ${{ parameters.buildId }}
       artifacts:

diff --git a/scripts/azure-pipelines-tests.yml b/scripts/azure-pipelines-tests.yml
@@ -29,7 +29,7 @@ parameters:
         vmImage: ubuntu-20.04
 
 variables:
-  - template: azure-pipelines-variables.yml
+  - template: /scripts/azure-pipelines-variables.yml@self
 
 resources:
   repositories:
@@ -44,7 +44,7 @@ resources:
       trigger: true
 
 stages:
-  - template: azure-templates-stages.yml
+  - template: /scripts/azure-templates-stages.yml@self
     parameters:
       buildPipelineType: 'tests'
       VM_IMAGE_HOST: ${{ parameters.VM_IMAGE_HOST }}

diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml
@@ -39,7 +39,7 @@ parameters:
         vmImage: ubuntu-20.04
 
 variables:
-  - template: azure-pipelines-variables.yml
+  - template: /scripts/azure-pipelines-variables.yml@self
 
 resources:
   repositories:
@@ -50,7 +50,7 @@ resources:
       ref: refs/heads/main
 
 stages:
-  - template: azure-templates-stages.yml
+  - template: /scripts/azure-templates-stages.yml@self
     parameters:
       buildPipelineType: 'build'
       buildExternals: ${{ parameters.buildExternals }}

diff --git a/scripts/azure-templates-bootstrapper.yml b/scripts/azure-templates-bootstrapper.yml
@@ -48,15 +48,15 @@ jobs:
       # prepare
       - checkout: self
         submodules: recursive
-      - template: azure-templates-variables.yml
+      - template: /scripts/azure-templates-variables.yml@self
 
       # checkout required skia PR
       - pwsh: .\scripts\checkout-skia.ps1 -GitHubToken $(GitHub.Token.PublicAccess)
         displayName: Checkout required skia PR
         condition: eq(variables['Build.Reason'], 'PullRequest')
 
       - ${{ if eq(parameters.buildPipelineType, 'tests') }}:
-        - template: azure-templates-github-status.yml
+        - template: /scripts/azure-templates-github-status.yml@self
           parameters:
             state: 'pending'
 
@@ -259,11 +259,11 @@ jobs:
           condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
 
       # download artifacts
-      - template: azure-templates-download-artifacts.yml
+      - template: /scripts/azure-templates-download-artifacts.yml@self
         parameters:
           condition: and(succeeded(), eq(variables['DOWNLOAD_EXTERNALS'], ''))
           artifacts: ${{ parameters.requiredArtifacts }}
-      - template: azure-templates-download-artifacts.yml
+      - template: /scripts/azure-templates-download-artifacts.yml@self
         parameters:
           condition: and(succeeded(), ne(variables['DOWNLOAD_EXTERNALS'], ''))
           sourceBuildId: $(DOWNLOAD_EXTERNALS)
@@ -350,4 +350,4 @@ jobs:
             alertWarningLevel: 'High'
 
       - ${{ if eq(parameters.buildPipelineType, 'tests') }}:
-        - template: azure-templates-github-status.yml
+        - template: /scripts/azure-templates-github-status.yml@self
diff --git a/scripts/azure-templates-linux-matrix.yml b/scripts/azure-templates-linux-matrix.yml
@@ -20,7 +20,7 @@ parameters:
 jobs:
   - ${{ each build in parameters.builds }}:
     - ${{ each item in parameters.matrix }}:
-      - template: azure-templates-bootstrapper.yml
+      - template: /scripts/azure-templates-bootstrapper.yml@self
         parameters:
           name: ${{ replace(replace(format('native_linux_{0}_{1}_{2}_{3}_linux', item.arch, item.variant, build.name, item.alt), '__', '_'), '__', '_') }}
           displayName: Linux ${{ replace(replace(replace(replace(replace(format('({0}|{1}|{2}|{3})', item.arch, item.variant, build.name, item.alt), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}