From 85c8677d59ca787c9865e6ef37d22c15bb47c469 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Mon, 3 Oct 2022 14:49:17 -0700 Subject: [PATCH 1/2] Update CI machine pools --- eng/azure-pipelines.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index aadc3b880..676056024 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -29,15 +29,20 @@ jobs: enablePublishUsingPipelines: $(_PublishUsingPipelines) enableTelemetry: true helixRepo: dotnet/standard + ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + runAsPublic: true + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + runAsPublic: false + jobs: - job: Windows_NT pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals build.windows.10.amd64.vs2019.pre.open + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals windows.vs2022preview.amd64 variables: # Enable signing for internal, non-PR builds - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: From 9bcb2c5764099370c8558fdc3223e5e733860381 Mon Sep 17 00:00:00 2001 From: Jonathon Marolf Date: Mon, 3 Oct 2022 14:52:49 -0700 Subject: [PATCH 2/2] fix pool name --- eng/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index 676056024..fc6cc581b 100644 --- a/eng/azure-pipelines.yml +++ b/eng/azure-pipelines.yml @@ -38,7 +38,7 @@ jobs: - job: Windows_NT pool: ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - name: NetCore1ESPool-Public + name: NetCore-Public demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: name: NetCore1ESPool-Internal