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

This should work.

Browse source
This commit is contained in:
Michael Yanni 2024-03-19 10:23:54 -07:00
parent a2387eaa85
commit 3e36cb5954
2 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

59
.vsts-ci.yml
View file

@ -75,8 +75,7 @@ extends:
stages: stages:
- stage: Build - stage: Build
variables: variables:
- name: _OneESPT _OneESPT: true
value: true
jobs: jobs:
# Build Retry Configuration # Build Retry Configuration
- job: Publish_Build_Configuration - job: Publish_Build_Configuration
@ -109,7 +108,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
additionalBuildParameters: '/p:PublishInternalAsset=true' additionalBuildParameters: '/p:PublishInternalAsset=true'
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Linux # Linux
- template: eng/build.yml@self - template: eng/build.yml@self
@ -121,7 +120,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -131,7 +130,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -141,7 +140,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: false linuxPortable: false
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -152,7 +151,7 @@ extends:
additionalBuildParameters: '/p:BuildSdkDeb=true' additionalBuildParameters: '/p:BuildSdkDeb=true'
linuxPortable: false linuxPortable: false
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -163,7 +162,7 @@ extends:
linuxPortable: true linuxPortable: true
# Never run tests on arm64 # Never run tests on arm64
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -176,7 +175,7 @@ extends:
additionalBuildParameters: '/p:HostOSName="linux-musl"' additionalBuildParameters: '/p:HostOSName="linux-musl"'
linuxPortable: false linuxPortable: false
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -185,7 +184,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# MacOS # MacOS
- template: eng/build.yml@self - template: eng/build.yml@self
@ -195,7 +194,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x64 buildArchitecture: x64
runTests: true runTests: true
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Official/PGO instrumentation Builds # Official/PGO instrumentation Builds
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
@ -208,7 +207,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
additionalBuildParameters: '/p:PublishInternalAsset=true' additionalBuildParameters: '/p:PublishInternalAsset=true'
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Windows_NT agentOs: Windows_NT
@ -216,7 +215,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x86 buildArchitecture: x86
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Windows_NT agentOs: Windows_NT
@ -224,7 +223,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm64 buildArchitecture: arm64
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Linux # Linux
- template: eng/build.yml@self - template: eng/build.yml@self
@ -236,7 +235,7 @@ extends:
runtimeIdentifier: 'linux-arm' runtimeIdentifier: 'linux-arm'
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -246,7 +245,7 @@ extends:
runtimeIdentifier: 'linux-arm64' runtimeIdentifier: 'linux-arm64'
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -258,7 +257,7 @@ extends:
additionalBuildParameters: '/p:OSName="linux-musl"' additionalBuildParameters: '/p:OSName="linux-musl"'
linuxPortable: false linuxPortable: false
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -269,7 +268,7 @@ extends:
additionalBuildParameters: '/p:OSName="linux-musl"' additionalBuildParameters: '/p:OSName="linux-musl"'
linuxPortable: false linuxPortable: false
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -282,7 +281,7 @@ extends:
additionalBuildParameters: '/p:HostOSName="linux-musl"' additionalBuildParameters: '/p:HostOSName="linux-musl"'
linuxPortable: false linuxPortable: false
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -295,7 +294,7 @@ extends:
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -308,7 +307,7 @@ extends:
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -322,7 +321,7 @@ extends:
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -331,7 +330,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# MacOS # MacOS
- template: eng/build.yml@self - template: eng/build.yml@self
@ -341,7 +340,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x64 buildArchitecture: x64
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Darwin agentOs: Darwin
@ -350,7 +349,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm64 buildArchitecture: arm64
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Windows PGO Instrumentation # Windows PGO Instrumentation
- template: eng/build.yml@self - template: eng/build.yml@self
@ -362,7 +361,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
additionalBuildParameters: '/p:PublishInternalAsset=true' additionalBuildParameters: '/p:PublishInternalAsset=true'
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Windows_NT agentOs: Windows_NT
@ -371,7 +370,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: x86 buildArchitecture: x86
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Windows_NT agentOs: Windows_NT
@ -380,7 +379,7 @@ extends:
buildConfiguration: Release buildConfiguration: Release
buildArchitecture: arm64 buildArchitecture: arm64
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Linux PGO Instrumentation # Linux PGO Instrumentation
- template: eng/build.yml@self - template: eng/build.yml@self
@ -392,7 +391,7 @@ extends:
buildArchitecture: x64 buildArchitecture: x64
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
- template: eng/build.yml@self - template: eng/build.yml@self
parameters: parameters:
agentOs: Linux agentOs: Linux
@ -402,7 +401,7 @@ extends:
buildArchitecture: arm64 buildArchitecture: arm64
linuxPortable: true linuxPortable: true
runTests: false runTests: false
OneESPT: true OneESPT: ${{ variables._OneESPT }}
# Source Build # Source Build
- template: /eng/common/templates-official/jobs/source-build.yml@self - template: /eng/common/templates-official/jobs/source-build.yml@self

13
eng/build.yml
View file

@ -72,16 +72,6 @@ parameters:
type: boolean type: boolean
default: false default: false
# - name: publishTaskName
# type: string
# # https://stackoverflow.com/a/70184550/294804
# default: $[replace(replace('True', eq(variables['OneESPT'], true), '1ES.PublishBuildArtifacts@1'), 'True', 'PublishBuildArtifacts@1')]
# - name: jobTemplatePath
# type: string
# # https://stackoverflow.com/a/70184550/294804
# default: $[replace(replace('True', eq(variables['OneESPT'], true), 'common/templates-official/job/job.yml'), 'True', 'common/templates/job/job.yml')]
jobs: jobs:
- job: ListVars_${{ parameters.pgoInstrument }}_${{ parameters.agentOs }}_${{ parameters.jobName }} - job: ListVars_${{ parameters.pgoInstrument }}_${{ parameters.agentOs }}_${{ parameters.jobName }}
pool: pool:
@ -101,8 +91,7 @@ jobs:
# - template: ${{ parameters.jobTemplatePath }} # - template: ${{ parameters.jobTemplatePath }}
# - ${{ if variables.OneESPT }}: # - ${{ if variables.OneESPT }}:
# - ${{ if eq(variables['OneESPT'], true) }}: # - ${{ if eq(variables['OneESPT'], true) }}:
# - ${{ if eq(parameters.OneESPT, true) }}: - ${{ if eq(parameters.OneESPT, true) }}:
- ${{ if eq(variables._OneESPT, true) }}:
- template: common/templates-official/job/job.yml - template: common/templates-official/job/job.yml
parameters: parameters:
# Set up the name of the job. # Set up the name of the job.