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.

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

refactor(ci): Pipeline yml cleanup #23412

Merged
merged 5 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion tools/pipelines/build-api-markdown-documenter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ trigger:
- tools/pipelines/templates/include-publish-npm-package-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -68,6 +69,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -76,7 +78,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-benchmark-tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ trigger:
- tools/pipelines/templates/include-publish-npm-package-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -68,6 +69,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -76,7 +78,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-build-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -70,6 +71,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -78,7 +80,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ trigger:
- tools/pipelines/templates/include-publish-npm-package-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -83,6 +84,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -91,7 +93,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
2 changes: 1 addition & 1 deletion tools/pipelines/build-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml

pr:
Expand Down Expand Up @@ -175,7 +176,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-common-utils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml

pr:
Expand All @@ -79,14 +80,14 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml

variables:
- template: /tools/pipelines/templates/include-vars.yml@self
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-eslint-config-fluid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -72,6 +73,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -80,7 +82,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-eslint-plugin-fluid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -72,6 +73,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -80,7 +82,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-protocol-definitions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ trigger:
- tools/pipelines/templates/include-git-tag-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml

pr:
Expand All @@ -80,14 +81,14 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml

variables:
- template: /tools/pipelines/templates/include-vars.yml@self
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
3 changes: 2 additions & 1 deletion tools/pipelines/build-test-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ trigger:
- tools/pipelines/templates/include-publish-npm-package-steps.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -66,6 +67,7 @@ pr:
- tools/pipelines/templates/include-install-pnpm.yml
- tools/pipelines/templates/include-use-node-version.yml
- tools/pipelines/templates/include-process-test-results.yml
- tools/pipelines/templates/include-policy-check.yml
- tools/pipelines/templates/upload-dev-manifest.yml
- scripts/*

Expand All @@ -74,7 +76,6 @@ variables:
parameters:
publishOverride: '${{ parameters.publishOverride }}'
releaseBuildOverride: '${{ parameters.releaseBuildOverride }}'
buildNumberInPatch: ''

extends:
template: /tools/pipelines/templates/build-npm-package.yml@self
Expand Down
4 changes: 1 addition & 3 deletions tools/pipelines/templates/build-docker-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ parameters:
default: /home/node/server

- name: buildNumberInPatch
type: string
type: boolean
default: true

- name: setVersion
Expand Down Expand Up @@ -165,7 +165,6 @@ extends:
- job: build
displayName: Build Container - ${{ parameters.containerName }}
variables:
releaseBuildVar: $[variables.releaseBuild]
hostPathToPackArtifact: $(Build.ArtifactStagingDirectory)/pack
hostPathToTestResultsArtifact: $(Build.ArtifactStagingDirectory)/${{ parameters.buildDirectory }}/nyc
hostPathToApiExtractorArtifact: $(Build.ArtifactStagingDirectory)/_api-extractor-temp
Expand Down Expand Up @@ -193,7 +192,6 @@ extends:
# Show all task group conditions
echo "
Pipeline Variables:
releaseBuild=$(releaseBuildVar)

Tasks Parameters:
docs=${{ parameters.docs }}
Expand Down
11 changes: 4 additions & 7 deletions tools/pipelines/templates/build-npm-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ parameters:
default: false

- name: buildNumberInPatch
type: string
default:
type: boolean
default: false

- name: publishOverride
type: string
Expand Down Expand Up @@ -211,8 +211,6 @@ extends:
variables:
- group: ado-feeds
- group: storage-vars
- name: releaseBuildVar
value: '$[variables.releaseBuild]'
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
- name: targetBranchName
value: $(System.PullRequest.TargetBranch)
Expand Down Expand Up @@ -241,7 +239,6 @@ extends:

echo "
Pipeline Variables:
releaseBuild=$(releaseBuildVar)

Override Parameters:
packageTypesOverride=${{ parameters.packageTypesOverride }}
Expand Down Expand Up @@ -335,7 +332,7 @@ extends:
- template: /tools/pipelines/templates/include-set-package-version.yml@self
parameters:
buildDirectory: '${{ parameters.buildDirectory }}'
buildNumberInPatch: '${{ parameters.buildNumberInPatch }}'
buildNumberInPatch: ${{ parameters.buildNumberInPatch }}
buildToolsVersionToInstall: '${{ parameters.buildToolsVersionToInstall }}'
tagName: '${{ parameters.tagName }}'
interdependencyRange: '${{ parameters.interdependencyRange }}'
Expand Down Expand Up @@ -651,7 +648,7 @@ extends:

# Publish stage
- ${{ if eq(parameters.publish, true) }}:
- template: include-publish-npm-package.yml
- template: /tools/pipelines/templates/include-publish-npm-package.yml@self
parameters:
tagName: ${{ parameters.tagName }}
isReleaseGroup: ${{ parameters.isReleaseGroup }}
Expand Down
2 changes: 1 addition & 1 deletion tools/pipelines/templates/include-install-build-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ steps:
# These steps should ONLY run if we're using the repo version of the build tools. These steps are mutually exclusive
# with the next group of steps.
- ${{ if eq(parameters.buildToolsVersionToInstall, 'repo') }}:
- template: include-install-pnpm.yml
- template: /tools/pipelines/templates/include-install-pnpm.yml@self
parameters:
buildDirectory: $(Build.SourcesDirectory)/build-tools
pnpmStorePath: ${{ parameters.pnpmStorePath }}
Expand Down
2 changes: 1 addition & 1 deletion tools/pipelines/templates/include-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:

steps:
- ${{ if eq(parameters.packageManager, 'pnpm') }}:
- template: include-install-pnpm.yml
- template: /tools/pipelines/templates/include-install-pnpm.yml@self
parameters:
buildDirectory: ${{ parameters.buildDirectory }}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
- download: current
artifact: pack
- template: /tools/pipelines/templates/include-use-node-version.yml@self
- template: include-install-build-tools.yml
- template: /tools/pipelines/templates/include-install-build-tools.yml@self
parameters:
buildDirectory: ${{ parameters.buildDirectory }}
buildToolsVersionToInstall: ${{ parameters.buildToolsVersionToInstall }}
Expand Down
6 changes: 3 additions & 3 deletions tools/pipelines/templates/include-set-package-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ parameters:
- name: buildDirectory
type: string
- name: buildNumberInPatch
type: string
default:
type: boolean
default: false
- name: tagName
type: string
- name: includeInternalVersions
Expand Down Expand Up @@ -35,7 +35,7 @@ parameters:
# Set version
steps:

- template: include-install-build-tools.yml
- template: /tools/pipelines/templates/include-install-build-tools.yml@self
parameters:
buildDirectory: ${{ parameters.buildDirectory }}
buildToolsVersionToInstall: ${{ parameters.buildToolsVersionToInstall }}
Expand Down
2 changes: 1 addition & 1 deletion tools/pipelines/templates/include-telemetry-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ steps:
- checkout: self
clean: true

- template: include-use-node-version.yml
- template: /tools/pipelines/templates/include-use-node-version.yml@self

- task: Bash@3
displayName: Print parameter/variable values for template
Expand Down
2 changes: 1 addition & 1 deletion tools/pipelines/templates/include-test-perf-benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ steps:
SourceBranch=$(Build.SourceBranch)
"

- template: include-telemetry-setup.yml
- template: /tools/pipelines/templates/include-telemetry-setup.yml@self
parameters:
devFeedUrl: ${{ parameters.devFeedUrl }}
officeFeedUrl: ${{ parameters.officeFeedUrl }}
Expand Down
4 changes: 2 additions & 2 deletions tools/pipelines/templates/include-test-real-service.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ stages:
artifactBuildId=${{ parameters.artifactBuildId }}
"

- template: include-use-node-version.yml
- template: /tools/pipelines/templates/include-use-node-version.yml@self

# Download artifact
- task: DownloadPipelineArtifact@2
Expand Down Expand Up @@ -440,7 +440,7 @@ stages:
continueOnError: true # Keep running subsequent tasks even if this one fails (e.g. the tinylicious log wasn't there)

# Log Test Failures
# - template: include-process-test-results.yml
# - template: /tools/pipelines/templates/include-process-test-results.yml@self
# parameters:
# buildDirectory: ${{ variables.testPackageDir }}

Expand Down
Loading
Loading