From 3e36cb59546e9415a0201badcd32f652d2fe6c83 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 19 Mar 2024 10:23:54 -0700 Subject: [PATCH] This should work. --- .vsts-ci.yml | 59 +++++++++++++++++++++++++-------------------------- eng/build.yml | 13 +----------- 2 files changed, 30 insertions(+), 42 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 87412535a..9c7eeecf4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -75,8 +75,7 @@ extends: stages: - stage: Build variables: - - name: _OneESPT - value: true + _OneESPT: true jobs: # Build Retry Configuration - job: Publish_Build_Configuration @@ -109,7 +108,7 @@ extends: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Linux - template: eng/build.yml@self @@ -121,7 +120,7 @@ extends: buildArchitecture: x64 linuxPortable: true runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -131,7 +130,7 @@ extends: buildArchitecture: x64 linuxPortable: true runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -141,7 +140,7 @@ extends: buildArchitecture: x64 linuxPortable: false runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -152,7 +151,7 @@ extends: additionalBuildParameters: '/p:BuildSdkDeb=true' linuxPortable: false runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -163,7 +162,7 @@ extends: linuxPortable: true # Never run tests on arm64 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -176,7 +175,7 @@ extends: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -185,7 +184,7 @@ extends: buildArchitecture: x64 linuxPortable: true runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # MacOS - template: eng/build.yml@self @@ -195,7 +194,7 @@ extends: buildConfiguration: Release buildArchitecture: x64 runTests: true - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Official/PGO instrumentation Builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -208,7 +207,7 @@ extends: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Windows_NT @@ -216,7 +215,7 @@ extends: buildConfiguration: Release buildArchitecture: x86 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Windows_NT @@ -224,7 +223,7 @@ extends: buildConfiguration: Release buildArchitecture: arm64 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Linux - template: eng/build.yml@self @@ -236,7 +235,7 @@ extends: runtimeIdentifier: 'linux-arm' linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -246,7 +245,7 @@ extends: runtimeIdentifier: 'linux-arm64' linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -258,7 +257,7 @@ extends: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -269,7 +268,7 @@ extends: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -282,7 +281,7 @@ extends: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -295,7 +294,7 @@ extends: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -308,7 +307,7 @@ extends: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -322,7 +321,7 @@ extends: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -331,7 +330,7 @@ extends: buildArchitecture: x64 linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # MacOS - template: eng/build.yml@self @@ -341,7 +340,7 @@ extends: buildConfiguration: Release buildArchitecture: x64 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Darwin @@ -350,7 +349,7 @@ extends: buildConfiguration: Release buildArchitecture: arm64 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Windows PGO Instrumentation - template: eng/build.yml@self @@ -362,7 +361,7 @@ extends: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Windows_NT @@ -371,7 +370,7 @@ extends: buildConfiguration: Release buildArchitecture: x86 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Windows_NT @@ -380,7 +379,7 @@ extends: buildConfiguration: Release buildArchitecture: arm64 runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Linux PGO Instrumentation - template: eng/build.yml@self @@ -392,7 +391,7 @@ extends: buildArchitecture: x64 linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} - template: eng/build.yml@self parameters: agentOs: Linux @@ -402,7 +401,7 @@ extends: buildArchitecture: arm64 linuxPortable: true runTests: false - OneESPT: true + OneESPT: ${{ variables._OneESPT }} # Source Build - template: /eng/common/templates-official/jobs/source-build.yml@self diff --git a/eng/build.yml b/eng/build.yml index 92c716d91..41eaffc4b 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -72,16 +72,6 @@ parameters: type: boolean 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: - job: ListVars_${{ parameters.pgoInstrument }}_${{ parameters.agentOs }}_${{ parameters.jobName }} pool: @@ -101,8 +91,7 @@ jobs: # - template: ${{ parameters.jobTemplatePath }} # - ${{ if variables.OneESPT }}: # - ${{ if eq(variables['OneESPT'], true) }}: -# - ${{ if eq(parameters.OneESPT, true) }}: -- ${{ if eq(variables._OneESPT, true) }}: +- ${{ if eq(parameters.OneESPT, true) }}: - template: common/templates-official/job/job.yml parameters: # Set up the name of the job.