mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[release/6.0.1xx] Update 6.0 source-build CI distro matrix (#19828)

Browse source 
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
This commit is contained in:
Michael Simons 2024-05-22 10:43:15 -05:00 committed by GitHub
parent aac91328f1
commit c67756174d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.vsts-ci.yml
View file

@ -63,8 +63,8 @@ extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
parameters: parameters:
containers: containers:
fedora38: fedora39:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
sdl: sdl:
sourceAnalysisPool: sourceAnalysisPool:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)

2
src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
View file

@ -2,7 +2,7 @@
jobs: jobs:
- job: Source_Build_Create_Tarball - job: Source_Build_Create_Tarball
container: fedora38 container: fedora39
displayName: Source-Build Create Tarball displayName: Source-Build Create Tarball
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:

26
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
View file

@ -12,9 +12,8 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
poolInternalAmd64: poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
@ -64,20 +63,13 @@ jobs:
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true _OverrideDistroDisablingSha1: true
_RunOnline: false _RunOnline: false
Fedora38-Offline: Fedora39-Offline:
_BootstrapPrep: false _BootstrapPrep: false
_Container: ${{ parameters.fedora38Container }} _Container: ${{ parameters.fedora39Container }}
_EnablePoison: true _EnablePoison: true
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false
_RunOnline: false _RunOnline: false
Ubuntu1804-Offline:
_BootstrapPrep: false
_Container: ${{ parameters.ubuntu1804Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
_RunOnline: false
name: Build_Tarball_x64 name: Build_Tarball_x64
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
@ -95,9 +87,9 @@ jobs:
dependsOn: ${{ parameters.dependsOn }} dependsOn: ${{ parameters.dependsOn }}
installerBuildResourceId: ${{ parameters.installerBuildResourceId }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix: matrix:
Debian11-Offline: Ubuntu2004-Offline:
_BootstrapPrep: true _BootstrapPrep: true
_Container: ${{ parameters.debian11Arm64Container }} _Container: ${{ parameters.ubuntu2004Arm64Container }}
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false
@ -116,9 +108,9 @@ jobs:
excludeSdkContentTests: true excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix: matrix:
Fedora38-Offline: Fedora39-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
_Container: ${{ parameters.fedora38Container }} _Container: ${{ parameters.fedora39Container }}
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false

26
src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
View file

@ -12,9 +12,8 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
poolInternalAmd64: poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal name: NetCore1ESPool-Svc-Internal
image: 1es-ubuntu-2004 image: 1es-ubuntu-2004
@ -70,20 +69,13 @@ jobs:
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true _OverrideDistroDisablingSha1: true
_RunOnline: false _RunOnline: false
Fedora38-Offline: Fedora39-Offline:
_BootstrapPrep: false _BootstrapPrep: false
_Container: ${{ parameters.fedora38Container }} _Container: ${{ parameters.fedora39Container }}
_EnablePoison: true _EnablePoison: true
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false
_RunOnline: false _RunOnline: false
Ubuntu1804-Offline:
_BootstrapPrep: false
_Container: ${{ parameters.ubuntu1804Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
_RunOnline: false
name: Build_Tarball_x64 name: Build_Tarball_x64
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
@ -101,9 +93,9 @@ jobs:
dependsOn: ${{ parameters.dependsOn }} dependsOn: ${{ parameters.dependsOn }}
installerBuildResourceId: ${{ parameters.installerBuildResourceId }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix: matrix:
Debian11-Offline: Ubuntu2004-Offline:
_BootstrapPrep: true _BootstrapPrep: true
_Container: ${{ parameters.debian11Arm64Container }} _Container: ${{ parameters.ubuntu2004Arm64Container }}
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false
@ -122,9 +114,9 @@ jobs:
excludeSdkContentTests: true excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }} installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix: matrix:
Fedora38-Offline: Fedora39-Offline:
_PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
_Container: ${{ parameters.fedora38Container }} _Container: ${{ parameters.fedora39Container }}
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false _OverrideDistroDisablingSha1: false

4
src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml
View file

@ -37,9 +37,9 @@ extends:
architecture: x64 architecture: x64
excludeSdkContentTests: true excludeSdkContentTests: true
matrix: matrix:
Ubuntu1804-Offline: Ubuntu2004-Offline:
_BootstrapPrep: false _BootstrapPrep: false
_Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
_EnablePoison: false _EnablePoison: false
_ExcludeOmniSharpTests: false _ExcludeOmniSharpTests: false
_RunOnline: false _RunOnline: false