diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2018-11-04 15:49:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-04 15:49:22 +0000 |
commit | b4a6c13dcca834daa6899665b74362e590b80947 (patch) | |
tree | cd5a2ad6d8fb90e564ba595d4c0d59c3fea6f49e /eng/common/templates | |
parent | 6d9fc60df3b721eab98ca08386a1f01358f93839 (diff) | |
download | coreclr-b4a6c13dcca834daa6899665b74362e590b80947.tar.gz coreclr-b4a6c13dcca834daa6899665b74362e590b80947.tar.bz2 coreclr-b4a6c13dcca834daa6899665b74362e590b80947.zip |
[Darc-Update] Update dependencies from build 20181102.21 of https://github.com/dotnet/arcade (#20783)
* Updating version files
* Updating version files
Diffstat (limited to 'eng/common/templates')
-rw-r--r-- | eng/common/templates/phases/base.yml | 11 | ||||
-rw-r--r-- | eng/common/templates/phases/publish-build-assets.yml | 3 | ||||
-rw-r--r-- | eng/common/templates/steps/telemetry-start.yml | 3 |
3 files changed, 12 insertions, 5 deletions
diff --git a/eng/common/templates/phases/base.yml b/eng/common/templates/phases/base.yml index 92a7933eb5..35294aea0a 100644 --- a/eng/common/templates/phases/base.yml +++ b/eng/common/templates/phases/base.yml @@ -17,6 +17,10 @@ parameters: # Optional: variables variables: {} + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + ## Telemetry variables # Optional: enable sending telemetry @@ -56,10 +60,11 @@ phases: buildConfig: $(_HelixBuildConfig) helixSource: $(_HelixSource) helixType: $(_HelixType) + runAsPublic: ${{ parameters.runAsPublic }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: # Internal only resource, and Microbuild signing shouldn't be applied to PRs. - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildSigningPlugin@2 displayName: Install MicroBuild plugin inputs: @@ -77,7 +82,7 @@ phases: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: # Internal only resources - - ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) @@ -90,7 +95,7 @@ phases: helixSource: $(_HelixSource) helixType: $(_HelixType) - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: CopyFiles@2 displayName: Gather Asset Manifests inputs: diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index c7ed5caa5d..c9381cf104 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -4,6 +4,7 @@ parameters: configuration: 'Debug' condition: succeeded() continueOnError: false + runAsPublic: false phases: - phase: Asset_Registry_Publish displayName: Publish to Build Asset Registry @@ -12,7 +13,7 @@ phases: variables: config: ${{ parameters.configuration }} steps: - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 displayName: Download artifact inputs: diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 109b4f5d88..07f1185d17 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -2,9 +2,10 @@ parameters: helixSource: 'undefined_defaulted_in_telemetry.yml' helixType: 'undefined_defaulted_in_telemetry.yml' buildConfig: '' + runAsPublic: false steps: -- ${{ if and(not(eq(variables['System.TeamProject'], 'public')), ne(variables['Build.Repository.Provider'], 'GitHub')) }}: +- ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - task: AzureKeyVault@1 inputs: azureSubscription: 'HelixProd_KeyVault' |