Skip to content

Commit 7138413

Browse files
dougbudougbu
committed
Restore creation of binary logs in CI runs
This reverts part of commit d5849f3. - was "[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630)"
1 parent d58947f commit 7138413

File tree

3 files changed

+38
-32
lines changed

3 files changed

+38
-32
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ stages:
127127
# The sign settings have been configured to
128128
- script: ./build.cmd
129129
-ci
130-
-nobl
131130
-arch x64
132131
-pack
133132
-all
133+
/bl:artifacts/log/build.x64.binlog
134134
$(_BuildArgs)
135135
$(_InternalRuntimeDownloadArgs)
136136
displayName: Build x64
@@ -139,20 +139,19 @@ stages:
139139
# This is going to actually build x86 native assets.
140140
- script: ./build.cmd
141141
-ci
142-
-nobl
143142
-arch x86
144143
-pack
145144
-all
146145
-noBuildJava
147146
/p:OnlyPackPlatformSpecificPackages=true
147+
/bl:artifacts/log/build.x86.binlog
148148
$(_BuildArgs)
149149
$(_InternalRuntimeDownloadArgs)
150150
displayName: Build x86
151151

152152
# This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
153153
- script: .\src\SiteExtensions\build.cmd
154154
-ci
155-
-nobl
156155
-pack
157156
-noBuildDeps
158157
$(_BuildArgs)
@@ -165,20 +164,20 @@ stages:
165164
# Sign check is disabled because it is run in a separate step below, after installers are built.
166165
- script: ./build.cmd
167166
-ci
168-
-nobl
169167
-noBuild
170168
-noRestore
171169
-sign
170+
/bl:artifacts/log/build.codesign.binlog
172171
/p:DotNetSignType=$(_SignType)
173172
$(_BuildArgs)
174173
displayName: Code sign packages
175174

176175
# Windows installers bundle both x86 and x64 assets
177176
- script: ./build.cmd
178177
-ci
179-
-nobl
180178
-sign
181179
-buildInstallers
180+
/bl:artifacts/log/installers.msbuild.binlog
182181
/p:DotNetSignType=$(_SignType)
183182
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
184183
$(_BuildArgs)
@@ -218,6 +217,7 @@ stages:
218217
-pack
219218
-noBuildNodeJS
220219
-noBuildJava
220+
/bl:artifacts/log/build.win-arm.binlog
221221
/p:DotNetSignType=$(_SignType)
222222
/p:OnlyPackPlatformSpecificPackages=true
223223
/p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -247,6 +247,7 @@ stages:
247247
-pack
248248
-noBuildNodeJS
249249
-noBuildJava
250+
/bl:artifacts/log/build.win-arm64.binlog
250251
/p:DotNetSignType=$(_SignType)
251252
/p:OnlyPackPlatformSpecificPackages=true
252253
/p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -277,6 +278,7 @@ stages:
277278
--no-build-nodejs
278279
--no-build-java
279280
-p:OnlyPackPlatformSpecificPackages=true
281+
-bl:artifacts/log/build.macos.binlog
280282
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
281283
$(_BuildArgs)
282284
$(_PublishArgs)
@@ -304,43 +306,43 @@ stages:
304306
steps:
305307
- script: ./build.sh
306308
--ci
307-
--nobl
308309
--arch x64
309310
--pack
310311
--all
311312
--no-build-nodejs
312313
--no-build-java
313314
-p:OnlyPackPlatformSpecificPackages=true
315+
-bl:artifacts/log/build.linux-x64.binlog
314316
$(_BuildArgs)
315317
$(_InternalRuntimeDownloadArgs)
316318
displayName: Run build.sh
317319
- script: |
318320
git clean -xfd src/**/obj/
319321
./dockerbuild.sh bionic \
320322
--ci \
321-
--nobl \
322323
--arch x64 \
323324
--build-installers \
324325
--no-build-deps \
325326
--no-build-nodejs \
326327
-p:OnlyPackPlatformSpecificPackages=true \
327328
-p:BuildRuntimeArchive=false \
328329
-p:LinuxInstallerType=deb \
330+
-bl:artifacts/log/build.deb.binlog \
329331
$(_BuildArgs) \
330332
$(_InternalRuntimeDownloadArgs)
331333
displayName: Build Debian installers
332334
- script: |
333335
git clean -xfd src/**/obj/
334336
./dockerbuild.sh rhel \
335337
--ci \
336-
--nobl \
337338
--arch x64 \
338339
--build-installers \
339340
--no-build-deps \
340341
--no-build-nodejs \
341342
-p:OnlyPackPlatformSpecificPackages=true \
342343
-p:BuildRuntimeArchive=false \
343344
-p:LinuxInstallerType=rpm \
345+
-bl:artifacts/log/build.rpm.binlog \
344346
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml \
345347
$(_BuildArgs) \
346348
$(_PublishArgs) \
@@ -372,6 +374,7 @@ stages:
372374
--no-build-nodejs
373375
--no-build-java
374376
-p:OnlyPackPlatformSpecificPackages=true
377+
-bl:artifacts/log/build.linux-arm.binlog
375378
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
376379
$(_BuildArgs)
377380
$(_PublishArgs)
@@ -402,6 +405,7 @@ stages:
402405
--no-build-nodejs
403406
--no-build-java
404407
-p:OnlyPackPlatformSpecificPackages=true
408+
-bl:artifacts/log/build.arm64.binlog
405409
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
406410
$(_BuildArgs)
407411
$(_PublishArgs)
@@ -434,6 +438,7 @@ stages:
434438
--no-build-nodejs
435439
--no-build-java
436440
-p:OnlyPackPlatformSpecificPackages=true
441+
-bl:artifacts/log/build.musl.binlog
437442
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
438443
$(_BuildArgs)
439444
$(_PublishArgs)
@@ -467,6 +472,7 @@ stages:
467472
--no-build-nodejs
468473
--no-build-java
469474
-p:OnlyPackPlatformSpecificPackages=true
475+
-bl:artifacts/log/build.musl.binlog
470476
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
471477
$(_BuildArgs)
472478
$(_PublishArgs)
@@ -497,7 +503,7 @@ stages:
497503
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
498504
displayName: Setup IISExpress test certificates and schema
499505
afterBuild:
500-
- powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
506+
- powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunQuarantinedTests=true"
501507
displayName: Run Quarantined Tests
502508
continueOnError: true
503509
- task: PublishTestResults@2
@@ -528,11 +534,11 @@ stages:
528534
agentOs: Windows
529535
isTestingJob: true
530536
steps:
531-
- script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
537+
- script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
532538
displayName: Build Repo
533-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
539+
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
534540
displayName: Pack Templates
535-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
541+
- script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.test.binlog"
536542
displayName: Test Templates
537543
artifacts:
538544
- name: Windows_Test_Templates_Dumps
@@ -560,11 +566,11 @@ stages:
560566
- bash: "./eng/scripts/install-nginx-mac.sh"
561567
displayName: Installing Nginx
562568
afterBuild:
563-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
569+
- bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
564570
displayName: Pack Packages (for Template tests)
565-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
571+
- bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
566572
displayName: Pack Templates (for Template tests)
567-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
573+
- bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
568574
displayName: Run Quarantined Tests
569575
continueOnError: true
570576
- task: PublishTestResults@2
@@ -598,11 +604,11 @@ stages:
598604
- bash: "echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p"
599605
displayName: Increase inotify limit
600606
afterBuild:
601-
- bash: ./build.sh --ci --nobl --pack --no-build --no-restore --no-build-deps
607+
- bash: ./build.sh --ci --pack --no-build --no-restore --no-build-deps "/bl:artifacts/log/packages.pack.binlog"
602608
displayName: Pack Packages (for Template tests)
603-
- bash: ./src/ProjectTemplates/build.sh --ci --nobl --pack --no-restore --no-build-deps
609+
- bash: ./src/ProjectTemplates/build.sh --ci --pack --no-restore --no-build-deps "/bl:artifacts/log/template.pack.binlog"
604610
displayName: Pack Templates (for Template tests)
605-
- bash: ./build.sh --no-build --ci --nobl --test -p:RunQuarantinedTests=true
611+
- bash: ./build.sh --no-build --ci --test -p:RunQuarantinedTests=true
606612
displayName: Run Quarantined Tests
607613
continueOnError: true
608614
- task: PublishTestResults@2
@@ -631,11 +637,11 @@ stages:
631637
timeoutInMinutes: 180
632638
steps:
633639
# Build the shared framework
634-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
640+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
635641
displayName: Build shared fx
636-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
642+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
637643
displayName: Restore interop projects
638-
- script: .\build.cmd -ci -nobl -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
644+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
639645
displayName: Run build.cmd helix target
640646
env:
641647
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -655,11 +661,11 @@ stages:
655661
timeoutInMinutes: 180
656662
steps:
657663
# Build the shared framework
658-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
664+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
659665
displayName: Build shared fx
660-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
666+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
661667
displayName: Restore interop projects
662-
- script: .\build.cmd -ci -nobl -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
668+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
663669
displayName: Run build.cmd helix target
664670
env:
665671
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -680,9 +686,9 @@ stages:
680686
timeoutInMinutes: 180
681687
steps:
682688
# Build the shared framework
683-
- script: ./restore.sh -ci -nobl
689+
- script: ./restore.sh -ci
684690
displayName: Restore
685-
- script: ./build.sh -ci --nobl --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
691+
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
686692
displayName: Run build.sh helix arm64 target
687693
env:
688694
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -721,7 +727,7 @@ stages:
721727
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
722728
env:
723729
Token: $(dn-bot-dnceng-artifact-feeds-rw)
724-
- script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
730+
- script: ./eng/scripts/ci-source-build.sh --ci --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false
725731
displayName: Run ci-source-build.sh
726732
- task: PublishBuildArtifacts@1
727733
displayName: Upload logs

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,13 @@ jobs:
198198
- ${{ if eq(parameters.steps, '')}}:
199199
- ${{ if eq(parameters.buildScript, '') }}:
200200
- ${{ if eq(parameters.agentOs, 'Windows') }}:
201-
- script: $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
201+
- script: .\$(BuildDirectory)\build.cmd -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
202202
displayName: Run build.cmd
203203
- ${{ if ne(parameters.agentOs, 'Windows') }}:
204-
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
204+
- script: ./$(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
205205
displayName: Run build.sh
206206
- ${{ if ne(parameters.buildScript, '') }}:
207-
- script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
207+
- script: $(BuildScript) -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs)
208208
displayName: run $(BuildScript)
209209

210210
- ${{ parameters.afterBuild }}

‎eng/scripts/CodeCheck.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ try {
4848
if ($ci) {
4949
# Install dotnet.exe
5050
if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) {
51-
& $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
51+
& $repoRoot/restore.cmd -ci -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
5252
}
5353
else{
54-
& $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS
54+
& $repoRoot/restore.cmd -ci -noBuildNodeJS
5555
}
5656
}
5757

0 commit comments

Comments
 (0)