Skip to content
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

Use full template specifications #2791

Merged
merged 1 commit into from
Mar 8, 2024
Merged

Use full template specifications #2791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 scripts/azure-pipelines-complete-internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pool:
vmImage: ubuntu-20.04

variables:
- template: azure-pipelines-variables.yml
- template: /scripts/azure-pipelines-variables.yml@self

resources:
repositories:
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines-complete.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines-cve.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ parameters:
vmImage: ubuntu-20.04

variables:
- template: azure-pipelines-variables.yml
- template: /scripts/azure-pipelines-variables.yml@self

resources:
repositories:
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions scripts/azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ parameters:
vmImage: ubuntu-20.04

variables:
- template: azure-pipelines-variables.yml
- template: /scripts/azure-pipelines-variables.yml@self

resources:
repositories:
Expand All @@ -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 }}
Expand Down
10 changes: 5 additions & 5 deletions scripts/azure-templates-bootstrapper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/azure-templates-linux-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), '||', '|'), '||', '|'), '(|', '('), '|)', ')'), '|', ', ') }}
Expand Down
Loading