huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[blazor-wasm] Update hosted and BYOC agents used in our builds 

- dotnet/aspnetcore-internal#3540
- nit: Consistently use in / notin with Build.Reason
  - YAML was inconsistent and this aligns w/ the Arcade code
This commit is contained in:
Doug Bunting 2020-03-06 23:38:23 -08:00
parent 112e3f1383
commit 59a92c8aa8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.azure/pipelines/ci.yml
View File

@ -39,7 +39,7 @@ variables:
- name: _SignType - name: _SignType
value: '' value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}: - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1 # DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
- group: DotNet-Blob-Feed - group: DotNet-Blob-Feed
@ -59,7 +59,7 @@ variables:
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- name: _BuildArgs - name: _BuildArgs
value: '' value: ''
- name: _SignType - name: _SignType
@ -83,10 +83,10 @@ stages:
agentOs: Windows agentOs: Windows
steps: steps:
- script: "echo ##vso[build.addbuildtag]daily-build" - script: "echo ##vso[build.addbuildtag]daily-build"
condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) condition: and(notin(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
displayName: 'Set CI tags' displayName: 'Set CI tags'
- script: "echo ##vso[build.addbuildtag]release-candidate" - script: "echo ##vso[build.addbuildtag]release-candidate"
condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease')) condition: and(notin(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
displayName: 'Set CI tags' displayName: 'Set CI tags'
# !!! NOTE !!! Some of these steps have disabled code signing. # !!! NOTE !!! Some of these steps have disabled code signing.

12
.azure/pipelines/jobs/default-build.yml
View File

@ -89,7 +89,7 @@ jobs:
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
pool: pool:
${{ if eq(parameters.agentOs, 'macOS') }}: ${{ if eq(parameters.agentOs, 'macOS') }}:
vmImage: macOS-10.13 vmImage: macOS-10.14
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
vmImage: ubuntu-16.04 vmImage: ubuntu-16.04
${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(parameters.agentOs, 'Windows') }}:
@ -97,14 +97,14 @@ jobs:
name: NetCorePublic-Pool name: NetCorePublic-Pool
${{ if ne(parameters.isTestingJob, true) }}: ${{ if ne(parameters.isTestingJob, true) }}:
# Visual Studio Build Tools # Visual Studio Build Tools
queue: BuildPool.Windows.10.Amd64.VS2019.BT.Open queue: BuildPool.Server.Amd64.VS2019.BT.Open
${{ if eq(parameters.isTestingJob, true) }}: ${{ if eq(parameters.isTestingJob, true) }}:
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019.Open queue: BuildPool.Server.Amd64.VS2019.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCoreInternal-Pool name: NetCoreInternal-Pool
# Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
queue: BuildPool.Windows.10.Amd64.VS2019 queue: BuildPool.Server.Amd64.VS2019
variables: variables:
- AgentOsName: ${{ parameters.agentOs }} - AgentOsName: ${{ parameters.agentOs }}
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping - ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
@ -120,9 +120,9 @@ jobs:
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}: - ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
- _SignType: '' - _SignType: ''
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}: - ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: real - _SignType: real
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
- _SignType: test - _SignType: test
steps: steps:
- checkout: self - checkout: self