Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ jobs:
queue: buildpool.windows.10.amd64.vs2019.pre
# runAsPublic is used in expressions, which can't read from user-defined variables
runAsPublic: false
timeoutInMinutes: 120 # how long to run the job before automatically cancelling; see https://github.com/dotnet/wpf/issues/952

10 changes: 7 additions & 3 deletions eng/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
- name: _PlatformArgs
value: /p:Platform=$(_Platform)
- name: _TestHelixAgentPool
value: 'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.Client19H1.Open'
value: 'Windows.10.Amd64.ClientRS5.Open' # Preferred:'Windows.10.Amd64.Open%3bWindows.7.Amd64.Open%3bWindows.10.Amd64.ClientRS5.Open'; See https://github.com/dotnet/wpf/issues/952
- name: _HelixStagingDir
value: $(BUILD.STAGINGDIRECTORY)\helix\functests
- name: _HelixSource
Expand All @@ -59,6 +59,8 @@ jobs:
value: ''
- name: _HelixCreator
value: ${{ parameters.repoName }}
- name: _HelixPublicBuildPipeline # Run Helix tests when building in the open, do not repeat when building and publishign again using the internal build-pipeline
value: true

# Override some values if we're building internally
- ${{ if eq(parameters.runAsPublic, 'false') }}:
Expand Down Expand Up @@ -97,7 +99,9 @@ jobs:
- name: _HelixCreator
value: '' #if _HelixToken is set, Creator must be empty
- name: _TestHelixAgentPool
value: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.Client19H1'
value: 'Windows.10.Amd64.ClientRS5' # Preferred: 'Windows.10.Amd64%3bWindows.7.Amd64%3bWindows.10.Amd64.ClientRS5'
- name: _HelixPublicBuildPipeline
value: false
strategy:
matrix:
Build_Debug_x86:
Expand Down Expand Up @@ -152,4 +156,4 @@ jobs:
HelixAccessToken: $(_HelixToken) # only defined for internal CI
Creator: $(_HelixCreator)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release')) # on helix machine (with real signing)
condition: and(succeeded(), eq(variables['_BuildConfig'], 'Release'), eq(variables['_HelixPublicBuildPipeline'], 'true')) # on helix machine (with real signing) when running on the public build pipeline