Skip to content

Centralize per-platform default build timeouts in sdk-build template #54804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelSimons merged 2 commits into from
Jun 17, 2026
Merged

Centralize per-platform default build timeouts in sdk-build template #54804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0267e2d
Centralize per-platform default timeouts in sdk-build template
MichaelSimons Jun 16, 2026
cf44601
Merge branch 'main' into michaelsimons/increase-mac-timeout-90min
MichaelSimons Jun 17, 2026
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
1 change: 0 additions & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@ extends:
populateInternalRuntimeVariables: true
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest'), ne(variables['Build.Reason'], 'BatchedCI')) }}:
timeoutInMinutes: 90
macOSJobParameterSets:
### OFFICIAL ###
- categoryName: Official
Expand Down
1 change: 0 additions & 1 deletion .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ stages:
vmImage: macOS-latest
os: macOS
helixTargetQueue: osx.15.amd64.open
timeoutInMinutes: 90
macOSJobParameterSets:
- categoryName: TestBuild
runtimeIdentifier: osx-x64
Expand Down
9 changes: 7 additions & 2 deletions eng/pipelines/templates/jobs/sdk-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ parameters:
testRunnerAdditionalArguments: ''
enableSbom: true
populateInternalRuntimeVariables: false
timeoutInMinutes: 60
timeoutInMinutes: ''
### ENV VARS ###
testFullMSBuild: false
runAoTTests: false
Expand Down Expand Up @@ -46,7 +46,12 @@ jobs:
container: ${{ parameters.container }}
strategy: ${{ parameters.strategy }}
helixRepo: dotnet/sdk
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
${{ if ne(parameters.timeoutInMinutes, '') }}:
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
${{ elseif eq(parameters.pool.os, 'macOS') }}:
timeoutInMinutes: 90
${{ else }}:
timeoutInMinutes: 60
enableMicrobuild: true
enablePublishBuildAssets: true
enableTelemetry: true
Expand Down
Loading