I've decided this is not worth the effort.
This commit is contained in:
parent
7305cb04a1
commit
a6bb92e242
2 changed files with 35 additions and 39 deletions
59
.vsts-ci.yml
59
.vsts-ci.yml
|
@ -34,9 +34,6 @@ variables:
|
|||
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
/p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64)
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
- name: globalOneESPT
|
||||
value: true
|
||||
readonly: true
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
|
@ -107,7 +104,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
additionalBuildParameters: '/p:PublishInternalAsset=true'
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -121,7 +118,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -133,7 +130,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -145,7 +142,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: false
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -158,7 +155,7 @@ extends:
|
|||
additionalBuildParameters: '/p:BuildSdkDeb=true'
|
||||
linuxPortable: false
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -171,7 +168,7 @@ extends:
|
|||
linuxPortable: true
|
||||
# Never run tests on arm64
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -186,7 +183,7 @@ extends:
|
|||
additionalBuildParameters: '/p:HostOSName="linux-musl"'
|
||||
linuxPortable: false
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -197,7 +194,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -209,7 +206,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: x64
|
||||
runTests: true
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -224,7 +221,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
additionalBuildParameters: '/p:PublishInternalAsset=true'
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -234,7 +231,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: x86
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -244,7 +241,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: arm64
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -258,7 +255,7 @@ extends:
|
|||
runtimeIdentifier: 'linux-arm'
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -270,7 +267,7 @@ extends:
|
|||
runtimeIdentifier: 'linux-arm64'
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -284,7 +281,7 @@ extends:
|
|||
additionalBuildParameters: '/p:OSName="linux-musl"'
|
||||
linuxPortable: false
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -297,7 +294,7 @@ extends:
|
|||
additionalBuildParameters: '/p:OSName="linux-musl"'
|
||||
linuxPortable: false
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -312,7 +309,7 @@ extends:
|
|||
additionalBuildParameters: '/p:HostOSName="linux-musl"'
|
||||
linuxPortable: false
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -327,7 +324,7 @@ extends:
|
|||
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true'
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -342,7 +339,7 @@ extends:
|
|||
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true'
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -358,7 +355,7 @@ extends:
|
|||
additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true'
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -369,7 +366,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -381,7 +378,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: x64
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -392,7 +389,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: arm64
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -406,7 +403,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
additionalBuildParameters: '/p:PublishInternalAsset=true'
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -417,7 +414,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: x86
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -428,7 +425,7 @@ extends:
|
|||
buildConfiguration: Release
|
||||
buildArchitecture: arm64
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
@ -442,7 +439,7 @@ extends:
|
|||
buildArchitecture: x64
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
- template: eng/build.yml@self
|
||||
|
@ -454,7 +451,7 @@ extends:
|
|||
buildArchitecture: arm64
|
||||
linuxPortable: true
|
||||
runTests: false
|
||||
OneESPT: true
|
||||
oneESPT: true
|
||||
jobTemplatePath: common/templates-official/job/job.yml
|
||||
publishTaskName: 1ES.PublishBuildArtifacts@1
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ parameters:
|
|||
type: boolean
|
||||
default: false
|
||||
|
||||
- name: OneESPT
|
||||
- name: oneESPT
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
|
@ -94,7 +94,7 @@ jobs:
|
|||
enableMicrobuild: true
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
${{ if parameters.OneESPT }}:
|
||||
${{ if parameters.oneESPT }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: 1es-windows-2022-open
|
||||
os: windows
|
||||
|
@ -102,7 +102,7 @@ jobs:
|
|||
name: $(DncEngPublicBuildPool)
|
||||
demands: ImageOverride -equals 1es-windows-2022-open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
${{ if parameters.OneESPT }}:
|
||||
${{ if parameters.oneESPT }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-windows-2022
|
||||
os: windows
|
||||
|
@ -112,7 +112,7 @@ jobs:
|
|||
${{ if eq(parameters.agentOs, 'Linux') }}:
|
||||
pool:
|
||||
${{ if eq(variables['System.TeamProject'], 'public') }}:
|
||||
${{ if parameters.OneESPT }}:
|
||||
${{ if parameters.oneESPT }}:
|
||||
name: $(DncEngPublicBuildPool)
|
||||
image: 1es-ubuntu-2004-open
|
||||
os: linux
|
||||
|
@ -120,7 +120,7 @@ jobs:
|
|||
name: $(DncEngPublicBuildPool)
|
||||
demands: ImageOverride -equals 1es-ubuntu-2004-open
|
||||
${{ if eq(variables['System.TeamProject'], 'internal') }}:
|
||||
${{ if parameters.OneESPT }}:
|
||||
${{ if parameters.oneESPT }}:
|
||||
name: $(DncEngInternalBuildPool)
|
||||
image: 1es-ubuntu-2204
|
||||
os: linux
|
||||
|
@ -130,8 +130,7 @@ jobs:
|
|||
container: ${{ parameters.container }}
|
||||
${{ if eq(parameters.agentOs, 'Darwin') }}:
|
||||
pool:
|
||||
# ${{ if parameters.OneESPT }}:
|
||||
${{ if variables.globalOneESPT }}:
|
||||
${{ if parameters.oneESPT }}:
|
||||
name: Azure Pipelines
|
||||
image: macOS-latest
|
||||
os: macOS
|
||||
|
@ -206,7 +205,7 @@ jobs:
|
|||
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
|
||||
$(_PgoInstrument)
|
||||
|
||||
- ${{ if parameters.OneESPT }}:
|
||||
- ${{ if parameters.oneESPT }}:
|
||||
- template: /eng/common/templates-official/variables/pool-providers.yml
|
||||
- ${{ else }}:
|
||||
- template: /eng/common/templates/variables/pool-providers.yml
|
||||
|
|
Loading…
Reference in a new issue