Skip to content

[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' #14911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelSimons merged 5 commits into from
Nov 8, 2022
Merged

[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' #14911

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
081ee69
Refactor source-build CI triggers and pools (#14835) (#14878)
MichaelSimons Nov 4, 2022
e58b4b5
Update triggers to prevent tarball CI from running on 6.0.3xx and 6.0…
MichaelSimons Nov 7, 2022
d454057
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/…
MichaelSimons Nov 7, 2022
48fb4b6
Merge pull request #14895 from dotnet-maestro-bot/merge/release/6.0.1…
v-wuzhai Nov 8, 2022
88b84d1
Merge branch 'release/6.0.3xx' into release/6.0.4xx
Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Refactor source-build CI triggers and pools (#14835) (#14878)
  • Loading branch information
@MichaelSimons
MichaelSimons authored Nov 4, 2022
commit 081ee69e53a16258fa848bda3608f5430a92056d
9 changes: 8 additions & 1 deletion eng/source-build-tarball-build-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ resources:
pipelines:
- pipeline: installer-build-resource
source: dotnet-installer-official-ci
trigger: true
trigger:
branches:
include:
- main
- release/*
- internal/release/*
stages:
- build

stages:
- stage: build
Expand Down
17 changes: 13 additions & 4 deletions src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,20 @@ jobs:
displayName: Source-Build Create Tarball
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Svc-Public
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
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') }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ if in(variables['Build.Reason'], 'PullRequest') }}:
name: NetCore1ESPool-Internal-XL
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
${{ else }}:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64

variables:
- name: _BuildConfig
value: Release
Expand Down
8 changes: 7 additions & 1 deletion src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ parameters:
fedora33Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-20210222183538-031e7d2
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-20210924170306-047508b
poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
poolInternalAmd64PR:
name: NetCore1ESPool-Internal-XL
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
poolInternalArm64:
Expand Down Expand Up @@ -76,7 +79,10 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'public') }}:
${{ parameters.poolPublicAmd64 }}
${{ 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') }}:
- template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml
Expand Down