Skip to content

Commit

Permalink
[release/6.1] Port two PRs from main branch (#5539)
Browse files Browse the repository at this point in the history
* fix not loc build issue with release/6.1 branch (#5537)

* Don't use obsolete -pt build images (#5536)

---------

Co-authored-by: Hong Li <hongli@microsoft.com>
Co-authored-by: Jo Shields <directhex@apebox.org>
  • Loading branch information
3 people authored May 9, 2024
1 parent 6f6d245 commit 6a8e73b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions azure-pipelines-arcade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@ extends:
sdl:
sourceAnalysisPool:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022-pt
image: 1es-windows-2022
os: windows
customBuildTags:
- ES365AIMigrationTooling
stages:
- 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
Expand All @@ -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: ''
Expand Down

0 comments on commit 6a8e73b

Please sign in to comment.