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

Use the object syntax for containers again. Use the 1es images for all (except macOS) since the 1es images should all work with 1ES PT.

Browse source
This commit is contained in:
Michael Yanni 2024-03-14 10:03:43 -07:00
parent 3fdd59c66e
commit 10c4260fe8
2 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
.vsts-ci.yml
View file

@ -46,42 +46,26 @@ extends:
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
parameters: parameters:
containers: containers:
# alpine319WithNode: alpine319WithNode:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
# cblMariner20Fpm:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
# centosStream8:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
# debian11Amd64:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
# fedora39:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
# ubuntu2204:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
# ubuntu2204CrossArmAlpine:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
# ubuntu2204DebPkg:
# image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
- container: alpine319WithNode
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
- container: cblMariner20Fpm cblMariner20Fpm:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
- container: centosStream8 centosStream8:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8
- container: debian11Amd64 debian11Amd64:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
- container: fedora39 fedora39:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
- container: ubuntu2204 ubuntu2204:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
- container: ubuntu2204CrossArmAlpine ubuntu2204CrossArmAlpine:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
- container: ubuntu2204DebPkg ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl: sdl:
sourceAnalysisPool: sourceAnalysisPool:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64 image: 1es-windows-2022
os: windows os: windows
# https://docs.opensource.microsoft.com/tools/cg/component-detection/variables/ # https://docs.opensource.microsoft.com/tools/cg/component-detection/variables/
componentgovernance: componentgovernance:
@ -96,11 +80,11 @@ extends:
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool) name: $(DncEngPublicBuildPool)
image: windows.vs2022preview.amd64.open image: 1es-windows-2022-open
os: windows os: windows
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64 image: 1es-windows-2022
os: windows os: windows
steps: steps:
- task: 1ES.PublishPipelineArtifact@1 - task: 1ES.PublishPipelineArtifact@1
@ -401,5 +385,5 @@ extends:
publishAssetsImmediately: true publishAssetsImmediately: true
pool: pool:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64 image: 1es-windows-2022
os: windows os: windows

6
eng/build.yml
View file

@ -83,17 +83,17 @@ jobs:
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool) name: $(DncEngPublicBuildPool)
image: windows.vs2022.amd64.open image: 1es-windows-2022-open
os: windows os: windows
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)
image: windows.vs2022preview.amd64 image: 1es-windows-2022
os: windows os: windows
${{ if eq(parameters.agentOs, 'Linux') }}: ${{ if eq(parameters.agentOs, 'Linux') }}:
pool: pool:
${{ if eq(variables['System.TeamProject'], 'public') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool) name: $(DncEngPublicBuildPool)
image: build.ubuntu.2204.amd64.open image: 1es-ubuntu-2004-open
os: linux os: linux
${{ if eq(variables['System.TeamProject'], 'internal') }}: ${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $(DncEngInternalBuildPool) name: $(DncEngInternalBuildPool)