Skip to content

Commit 59c87f6

Browse files
authored
Use normal $(_BuildArgs) in internal jobs w/ binlogs (#43597)
- give `$(*LogArgs)` variables slightly different conditions from `$(_BuildArgs)`, `$(_PublishArgs)`, … - that is, previous variable groupings were slightly off - enabling binary logs previously broke manifest creation etc.
1 parent 2939ac1 commit 59c87f6

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

.azure/pipelines/ci.yml

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,30 +72,32 @@ variables:
7272
/p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed)
7373
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
7474
/p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory)
75-
# Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
76-
- name: WindowsArm64LogArgs
77-
value: -ExcludeCIBinaryLog
78-
- name: Windows64LogArgs
79-
value: -ExcludeCIBinaryLog
80-
- name: Windows86LogArgs
81-
value: -ExcludeCIBinaryLog
82-
- name: WindowsSignLogArgs
83-
value: -ExcludeCIBinaryLog
84-
- name: WindowsInstallersLogArgs
85-
value: -ExcludeCIBinaryLog
86-
- name: WindowsArm64InstallersLogArgs
87-
value: -ExcludeCIBinaryLog
8875
# Variables for source indexing afterBuild step and job.
8976
- name: sourceIndexPackageVersion
9077
value: 1.0.1-20210614.1
9178
- name: sourceIndexPackageSource
9279
value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
9380
- group: source-dot-net stage1 variables
94-
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
81+
- ${{ if ne(parameters.produceBinlogs, 'true') }}:
82+
# Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
83+
- name: WindowsArm64LogArgs
84+
value: -ExcludeCIBinaryLog
85+
- name: Windows64LogArgs
86+
value: -ExcludeCIBinaryLog
87+
- name: Windows86LogArgs
88+
value: -ExcludeCIBinaryLog
89+
- name: WindowsSignLogArgs
90+
value: -ExcludeCIBinaryLog
91+
- name: WindowsInstallersLogArgs
92+
value: -ExcludeCIBinaryLog
93+
- name: WindowsArm64InstallersLogArgs
94+
value: -ExcludeCIBinaryLog
95+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
9596
- name: _BuildArgs
9697
value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
9798
- name: _PublishArgs
9899
value: ''
100+
- ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
99101
# Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
100102
- name: WindowsArm64LogArgs
101103
value: /bl:artifacts/log/Release/Build.arm64.binlog

0 commit comments

Comments
 (0)