diff --git a/tools/pipelines/build-api-markdown-documenter.yml b/tools/pipelines/build-api-markdown-documenter.yml index 571051667091..f45137ad1725 100644 --- a/tools/pipelines/build-api-markdown-documenter.yml +++ b/tools/pipelines/build-api-markdown-documenter.yml @@ -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/* @@ -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/* @@ -76,7 +78,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-benchmark-tool.yml b/tools/pipelines/build-benchmark-tool.yml index 142cabb68649..75fa4db847e1 100644 --- a/tools/pipelines/build-benchmark-tool.yml +++ b/tools/pipelines/build-benchmark-tool.yml @@ -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/* @@ -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/* @@ -76,7 +78,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-build-common.yml b/tools/pipelines/build-build-common.yml index 8b1ebf26823c..32e057f61f8e 100644 --- a/tools/pipelines/build-build-common.yml +++ b/tools/pipelines/build-build-common.yml @@ -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/* @@ -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/* @@ -78,7 +80,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-build-tools.yml b/tools/pipelines/build-build-tools.yml index 7095d7e9844b..b40c7db03f71 100644 --- a/tools/pipelines/build-build-tools.yml +++ b/tools/pipelines/build-build-tools.yml @@ -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/* @@ -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/* @@ -91,7 +93,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-client.yml b/tools/pipelines/build-client.yml index d5f5dad1128d..f6b79d2c198d 100644 --- a/tools/pipelines/build-client.yml +++ b/tools/pipelines/build-client.yml @@ -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: @@ -175,7 +176,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-common-utils.yml b/tools/pipelines/build-common-utils.yml index 406bc802388b..6ff03c9ca7ad 100644 --- a/tools/pipelines/build-common-utils.yml +++ b/tools/pipelines/build-common-utils.yml @@ -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: @@ -79,6 +80,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 variables: @@ -86,7 +88,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-eslint-config-fluid.yml b/tools/pipelines/build-eslint-config-fluid.yml index c9cd1dd111af..d6e576548837 100644 --- a/tools/pipelines/build-eslint-config-fluid.yml +++ b/tools/pipelines/build-eslint-config-fluid.yml @@ -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/* @@ -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/* @@ -80,7 +82,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-eslint-plugin-fluid.yml b/tools/pipelines/build-eslint-plugin-fluid.yml index c4a579687094..9ea362f5f53e 100644 --- a/tools/pipelines/build-eslint-plugin-fluid.yml +++ b/tools/pipelines/build-eslint-plugin-fluid.yml @@ -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/* @@ -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/* @@ -80,7 +82,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-protocol-definitions.yml b/tools/pipelines/build-protocol-definitions.yml index fe62d3831155..24b29c034bdb 100644 --- a/tools/pipelines/build-protocol-definitions.yml +++ b/tools/pipelines/build-protocol-definitions.yml @@ -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: @@ -80,6 +81,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 variables: @@ -87,7 +89,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/build-test-tools.yml b/tools/pipelines/build-test-tools.yml index 15a31f79a1ff..a96f3f4a990d 100644 --- a/tools/pipelines/build-test-tools.yml +++ b/tools/pipelines/build-test-tools.yml @@ -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/* @@ -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/* @@ -74,7 +76,6 @@ variables: parameters: publishOverride: '${{ parameters.publishOverride }}' releaseBuildOverride: '${{ parameters.releaseBuildOverride }}' - buildNumberInPatch: '' extends: template: /tools/pipelines/templates/build-npm-package.yml@self diff --git a/tools/pipelines/templates/build-docker-service.yml b/tools/pipelines/templates/build-docker-service.yml index 82d6e75a9da8..0b5ffda7f63d 100644 --- a/tools/pipelines/templates/build-docker-service.yml +++ b/tools/pipelines/templates/build-docker-service.yml @@ -31,7 +31,7 @@ parameters: default: /home/node/server - name: buildNumberInPatch - type: string + type: boolean default: true - name: setVersion @@ -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 @@ -193,7 +192,6 @@ extends: # Show all task group conditions echo " Pipeline Variables: - releaseBuild=$(releaseBuildVar) Tasks Parameters: docs=${{ parameters.docs }} diff --git a/tools/pipelines/templates/build-npm-package.yml b/tools/pipelines/templates/build-npm-package.yml index 451696d3bb69..9c3e3e965877 100644 --- a/tools/pipelines/templates/build-npm-package.yml +++ b/tools/pipelines/templates/build-npm-package.yml @@ -68,8 +68,8 @@ parameters: default: false - name: buildNumberInPatch - type: string - default: + type: boolean + default: false - name: publishOverride type: string @@ -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) @@ -241,7 +239,6 @@ extends: echo " Pipeline Variables: - releaseBuild=$(releaseBuildVar) Override Parameters: packageTypesOverride=${{ parameters.packageTypesOverride }} @@ -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 }}' @@ -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 }} diff --git a/tools/pipelines/templates/include-install-build-tools.yml b/tools/pipelines/templates/include-install-build-tools.yml index 2d44921de655..10ffbbc52d9a 100644 --- a/tools/pipelines/templates/include-install-build-tools.yml +++ b/tools/pipelines/templates/include-install-build-tools.yml @@ -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 }} diff --git a/tools/pipelines/templates/include-install.yml b/tools/pipelines/templates/include-install.yml index 8dea7e245c17..043f199d5b6b 100644 --- a/tools/pipelines/templates/include-install.yml +++ b/tools/pipelines/templates/include-install.yml @@ -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 }} diff --git a/tools/pipelines/templates/include-publish-npm-package-deployment.yml b/tools/pipelines/templates/include-publish-npm-package-deployment.yml index 9a81e7f65754..7b276394ef02 100644 --- a/tools/pipelines/templates/include-publish-npm-package-deployment.yml +++ b/tools/pipelines/templates/include-publish-npm-package-deployment.yml @@ -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 }} diff --git a/tools/pipelines/templates/include-set-package-version.yml b/tools/pipelines/templates/include-set-package-version.yml index 13be79224593..c50aa42814e1 100644 --- a/tools/pipelines/templates/include-set-package-version.yml +++ b/tools/pipelines/templates/include-set-package-version.yml @@ -5,8 +5,8 @@ parameters: - name: buildDirectory type: string - name: buildNumberInPatch - type: string - default: + type: boolean + default: false - name: tagName type: string - name: includeInternalVersions @@ -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 }} diff --git a/tools/pipelines/templates/include-telemetry-setup.yml b/tools/pipelines/templates/include-telemetry-setup.yml index a93d99991a53..2eeede0259f0 100644 --- a/tools/pipelines/templates/include-telemetry-setup.yml +++ b/tools/pipelines/templates/include-telemetry-setup.yml @@ -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 diff --git a/tools/pipelines/templates/include-test-perf-benchmarks.yml b/tools/pipelines/templates/include-test-perf-benchmarks.yml index b1ba180eaf32..b79ae16b7f9f 100644 --- a/tools/pipelines/templates/include-test-perf-benchmarks.yml +++ b/tools/pipelines/templates/include-test-perf-benchmarks.yml @@ -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 }} diff --git a/tools/pipelines/templates/include-test-real-service.yml b/tools/pipelines/templates/include-test-real-service.yml index 8e9b590458a4..56136ad93532 100644 --- a/tools/pipelines/templates/include-test-real-service.yml +++ b/tools/pipelines/templates/include-test-real-service.yml @@ -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 @@ -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 }} diff --git a/tools/pipelines/templates/include-test-stability.yml b/tools/pipelines/templates/include-test-stability.yml index bf14eee066af..a75df4ce84ec 100644 --- a/tools/pipelines/templates/include-test-stability.yml +++ b/tools/pipelines/templates/include-test-stability.yml @@ -58,7 +58,6 @@ jobs: pool: ${{ parameters.poolBuild }} variables: testCoverage: ${{ ne(variables['Build.Reason'], 'PullRequest') }} - releaseBuildVar: $[variables.releaseBuild] timeoutInMinutes: ${{ parameters.timeoutInMinutes }} steps: # Setup @@ -79,7 +78,6 @@ jobs: echo " Pipeline Variables: - releaseBuild=$(releaseBuildVar) Tasks Parameters: BuildDir=${{ parameters.buildDirectory }} @@ -90,15 +88,15 @@ jobs: TestCoverage=$(testCoverage) " - - template: include-use-node-version.yml + - template: /tools/pipelines/templates/include-use-node-version.yml@self - - template: include-install.yml + - template: /tools/pipelines/templates/include-install.yml@self parameters: packageManager: ${{ parameters.packageManager }} buildDirectory: ${{ parameters.buildDirectory }} packageManagerInstallCommand: ${{ parameters.packageManagerInstallCommand }} - - template: include-build-lint.yml + - template: /tools/pipelines/templates/include-build-lint.yml@self parameters: taskBuild: ${{ parameters.taskBuild }} taskLint: ${{ parameters.taskLint }} @@ -113,7 +111,7 @@ jobs: displayName: Start Test - ${{ each taskTestStep in parameters.taskTest }}: - - template: include-test-task.yml + - template: /tools/pipelines/templates/include-test-task.yml@self parameters: taskTestStep: ${{ taskTestStep }} buildDirectory: ${{ parameters.buildDirectory }} @@ -141,6 +139,6 @@ jobs: continueOnError: true # Process test result, include publishing and logging - - template: include-process-test-results.yml + - template: /tools/pipelines/templates/include-process-test-results.yml@self parameters: buildDirectory: ${{ parameters.buildDirectory }} diff --git a/tools/pipelines/templates/include-vars.yml b/tools/pipelines/templates/include-vars.yml index 06201ef9375d..295a95f068ff 100644 --- a/tools/pipelines/templates/include-vars.yml +++ b/tools/pipelines/templates/include-vars.yml @@ -17,7 +17,8 @@ parameters: default: false - name: buildNumberInPatch - type: string + type: boolean + default: false variables: - group: prague-key-vault @@ -66,8 +67,6 @@ variables: eq(variables.shouldPublish, true) ) )}} -- name: componentDetection - value: ${{ variables.publish }} - name: pushImage value: ${{ variables.publish }} - name: releaseImage