From ca29be9e8bcc2a90e8c59ba7f7ca8ae1cbf4b823 Mon Sep 17 00:00:00 2001 From: Hong Li Date: Wed, 8 May 2024 23:10:07 -0700 Subject: [PATCH 1/2] fix not loc build issue with release/6.1 branch (#5537) --- azure-pipelines-arcade.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-arcade.yml b/azure-pipelines-arcade.yml index dc42bf058bf..cfc14105588 100644 --- a/azure-pipelines-arcade.yml +++ b/azure-pipelines-arcade.yml @@ -45,7 +45,7 @@ extends: - stage: Build displayName: Build jobs: - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}: + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.SourceBranch'], 'refs/heads/release/6.1'))) }}: - template: /eng/common/templates-official/job/onelocbuild.yml@self parameters: MirrorRepo: wcf From e8800e8ffe827754504bbfc2d31738b1277df616 Mon Sep 17 00:00:00 2001 From: Jo Shields Date: Thu, 9 May 2024 02:15:45 -0400 Subject: [PATCH 2/2] Don't use obsolete -pt build images (#5536) --- azure-pipelines-arcade.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-arcade.yml b/azure-pipelines-arcade.yml index cfc14105588..72b637cdcca 100644 --- a/azure-pipelines-arcade.yml +++ b/azure-pipelines-arcade.yml @@ -37,7 +37,7 @@ extends: sdl: sourceAnalysisPool: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows customBuildTags: - ES365AIMigrationTooling @@ -65,7 +65,7 @@ extends: pool: ${{ if eq(variables._RunAsInternal, True) }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows variables: - _InternalBuildArgs: ''