diff options
| author | Stephen Halter <halter73@gmail.com> | 2022-09-02 05:42:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-02 05:42:41 +0300 |
| commit | 9e44c9f4b5fc60d12a9e3f0995ed33e5bc11601c (patch) | |
| tree | daa5917c1a1406def3d0523b91b435f7a092f50c /.azure | |
| parent | 3cdfafda025282a89c575ce4a32bd909425ec0af (diff) | |
| parent | 4cc9c7af0b0f14aac5076829db8c29bc94b57149 (diff) | |
Merge branch 'main' into merge/release/7.0-to-main
Diffstat (limited to '.azure')
| -rw-r--r-- | .azure/pipelines/jobs/default-build.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index 50e067cb93..e4d4231db8 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -109,14 +109,14 @@ jobs: vmImage: ubuntu-18.04 ${{ if or(eq(parameters.useHostedUbuntu, false), and(eq(variables['System.TeamProject'], 'internal'), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule'))) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: NetCore-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Svc-Public + name: NetCore-Public demands: ImageOverride -equals 1es-windows-2022-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal |