Skip to content

Commit 0c3c6d8

Browse files
authored
Merge pull request #19673 from dotnet/dougbu/master/newer.agents.3540
[master] Update hosted (AzDO) and BYOC (dnceng) agents used in our builds
2 parents ac5d237 + 0bb20cc commit 0c3c6d8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.azure/pipelines/ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ variables:
5656
- group: DotNet-HelixApi-Access
5757
- name: _UseHelixOpenQueues
5858
value: 'false'
59-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
59+
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
6060
# DotNet-Blob-Feed provides: dotnetfeed-storage-access-key-1
6161
# Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
6262
- group: DotNet-Blob-Feed
@@ -76,7 +76,7 @@ variables:
7676
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
7777
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
7878
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
79-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
79+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
8080
- name: _BuildArgs
8181
value: ''
8282
- name: _SignType
@@ -123,10 +123,10 @@ stages:
123123
agentOs: Windows
124124
steps:
125125
- script: "echo ##vso[build.addbuildtag]daily-build"
126-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
126+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), notin(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
127127
displayName: 'Set CI tags'
128128
- script: "echo ##vso[build.addbuildtag]release-candidate"
129-
condition: and(ne(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
129+
condition: and(notin(variables['Build.Reason'], 'PullRequest'), in(variables['DotNetFinalVersionKind'], 'release', 'prerelease'))
130130
displayName: 'Set CI tags'
131131

132132
# !!! NOTE !!! Some of these steps have disabled code signing.
@@ -665,7 +665,7 @@ stages:
665665
# Helix x64
666666
- template: jobs/default-build.yml
667667
parameters:
668-
condition: eq(variables['Build.Reason'], 'PullRequest')
668+
condition: in(variables['Build.Reason'], 'PullRequest')
669669
jobName: Helix_x64
670670
jobDisplayName: 'Tests: Helix x64'
671671
agentOs: Windows
@@ -689,7 +689,7 @@ stages:
689689

690690
- template: jobs/default-build.yml
691691
parameters:
692-
condition: ne(variables['Build.Reason'], 'PullRequest')
692+
condition: notin(variables['Build.Reason'], 'PullRequest')
693693
jobName: Helix_x64_daily
694694
jobDisplayName: 'Tests: Helix x64 Daily'
695695
agentOs: Windows
@@ -776,7 +776,7 @@ stages:
776776
displayName: Upload package artifacts
777777
# Only capture source build artifacts in PRs for the sake of inspecting
778778
# changes that impact source-build. The artifacts from this build pipeline are never actually used.
779-
condition: and(succeeded(), eq(variables['Build.Reason'], 'PullRequest'))
779+
condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest'))
780780
inputs:
781781
pathtoPublish: artifacts/packages/
782782
artifactName: Source_Build_Packages

.azure/pipelines/jobs/default-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
# See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md
9090
pool:
9191
${{ if eq(parameters.agentOs, 'macOS') }}:
92-
vmImage: macOS-10.13
92+
vmImage: macOS-10.14
9393
${{ if eq(parameters.agentOs, 'Linux') }}:
9494
vmImage: ubuntu-16.04
9595
${{ if eq(parameters.agentOs, 'Windows') }}:
@@ -120,9 +120,9 @@ jobs:
120120
- ${{ if or(ne(parameters.codeSign, true), ne(variables['System.TeamProject'], 'internal')) }}:
121121
- _SignType: ''
122122
- ${{ if and(eq(parameters.codeSign, true), eq(variables['System.TeamProject'], 'internal')) }}:
123-
- ${{ if ne(variables['Build.Reason'], 'PullRequest') }}:
123+
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
124124
- _SignType: real
125-
- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
125+
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
126126
- _SignType: test
127127
steps:
128128
- checkout: self

0 commit comments

Comments
 (0)