[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#14911)
* Refactor source-build CI triggers and pools (#14835) (#14878) * Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0.4xx (#14896) Co-authored-by: Michael Simons <msimons@microsoft.com> Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
This commit is contained in:
parent
72553f8783
commit
753a4009a5
3 changed files with 33 additions and 6 deletions
|
@ -4,7 +4,19 @@ resources:
|
||||||
pipelines:
|
pipelines:
|
||||||
- pipeline: installer-build-resource
|
- pipeline: installer-build-resource
|
||||||
source: dotnet-installer-official-ci
|
source: dotnet-installer-official-ci
|
||||||
trigger: true
|
trigger:
|
||||||
|
branches:
|
||||||
|
include:
|
||||||
|
- main
|
||||||
|
- release/*
|
||||||
|
- internal/release/*
|
||||||
|
exclude:
|
||||||
|
- release/6.0.3xx
|
||||||
|
- internal/release/6.0.3xx
|
||||||
|
- release/6.0.4xx
|
||||||
|
- internal/release/6.0.4xx
|
||||||
|
stages:
|
||||||
|
- build
|
||||||
|
|
||||||
stages:
|
stages:
|
||||||
- stage: build
|
- stage: build
|
||||||
|
|
|
@ -6,11 +6,20 @@ jobs:
|
||||||
displayName: Source-Build Create Tarball
|
displayName: Source-Build Create Tarball
|
||||||
pool:
|
pool:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
name: NetCore-Svc-Public
|
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
name: NetCore-Public-XL
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
|
${{ else }}:
|
||||||
|
name: NetCore-Svc-Public
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
name: NetCore1ESPool-Svc-Internal
|
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
name: NetCore1ESPool-Internal-XL
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
|
${{ else }}:
|
||||||
|
name: NetCore1ESPool-Svc-Internal
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
- name: _BuildConfig
|
- name: _BuildConfig
|
||||||
value: Release
|
value: Release
|
||||||
|
|
|
@ -17,6 +17,9 @@ parameters:
|
||||||
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
|
||||||
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
|
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
|
||||||
poolInternalAmd64:
|
poolInternalAmd64:
|
||||||
|
name: NetCore1ESPool-Svc-Internal
|
||||||
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
|
poolInternalAmd64PR:
|
||||||
name: NetCore1ESPool-Internal-XL
|
name: NetCore1ESPool-Internal-XL
|
||||||
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
|
||||||
poolInternalArm64:
|
poolInternalArm64:
|
||||||
|
@ -76,7 +79,10 @@ jobs:
|
||||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||||
${{ parameters.poolPublicAmd64 }}
|
${{ parameters.poolPublicAmd64 }}
|
||||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
${{ parameters.poolInternalAmd64 }}
|
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
|
||||||
|
${{ parameters.poolInternalAmd64PR }}
|
||||||
|
${{ else }}:
|
||||||
|
${{ parameters.poolInternalAmd64 }}
|
||||||
|
|
||||||
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||||
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
|
||||||
|
|
Loading…
Add table
Reference in a new issue