Skip to content

Commit a33e9f9

Browse files
committed
Specify -ci -nobl just once when using parameters.buildArgs
1 parent accfd57 commit a33e9f9

File tree

3 files changed

+7
-21
lines changed

3 files changed

+7
-21
lines changed

.azure/pipelines/benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
jobName: Windows_Build
1313
jobDisplayName: "Build only : Windows"
1414
agentOs: Windows
15-
buildArgs: -ci -all -pack
15+
buildArgs: -all -pack
1616
artifacts:
1717
- path: artifacts/
1818
includeForks: true

.azure/pipelines/ci.yml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,6 @@ stages:
215215
jobDisplayName: "Build: Windows ARM"
216216
agentOs: Windows
217217
buildArgs:
218-
-ci
219-
-nobl
220218
-arch arm
221219
-sign
222220
-pack
@@ -246,8 +244,6 @@ stages:
246244
jobDisplayName: "Build: Windows ARM64"
247245
agentOs: Windows
248246
buildArgs:
249-
-ci
250-
-nobl
251247
-arch arm64
252248
-sign
253249
-pack
@@ -278,8 +274,6 @@ stages:
278274
jobDisplayName: "Build: macOS"
279275
agentOs: macOs
280276
buildArgs:
281-
--ci
282-
--nobl
283277
--pack
284278
--all
285279
--no-build-nodejs
@@ -374,8 +368,6 @@ stages:
374368
jobDisplayName: "Build: Linux ARM"
375369
agentOs: Linux
376370
buildArgs:
377-
--ci
378-
--nobl
379371
--arch arm
380372
--pack
381373
--all
@@ -406,8 +398,6 @@ stages:
406398
jobDisplayName: "Build: Linux ARM64"
407399
agentOs: Linux
408400
buildArgs:
409-
--ci
410-
--nobl
411401
--arch arm64
412402
--all
413403
--pack
@@ -439,8 +429,6 @@ stages:
439429
agentOs: Linux
440430
buildScript: ./dockerbuild.sh alpine
441431
buildArgs:
442-
--ci
443-
--nobl
444432
--arch x64
445433
--os-name linux-musl
446434
--pack
@@ -474,8 +462,6 @@ stages:
474462
useHostedUbuntu: false
475463
buildScript: ./dockerbuild.sh ubuntu-alpine37
476464
buildArgs:
477-
--ci
478-
--nobl
479465
--arch arm64
480466
--os-name linux-musl
481467
--pack
@@ -508,7 +494,7 @@ stages:
508494
jobDisplayName: "Test: Windows Server 2016 x64"
509495
agentOs: Windows
510496
isTestingJob: true
511-
buildArgs: -ci -nobl -all -pack -test "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
497+
buildArgs: -all -pack -test "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
512498
beforeBuild:
513499
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
514500
displayName: Setup IISExpress test certificates and schema
@@ -571,7 +557,7 @@ stages:
571557
jobDisplayName: "Test: macOS 10.14"
572558
agentOs: macOS
573559
isTestingJob: true
574-
buildArgs: --ci --nobl --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
560+
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
575561
beforeBuild:
576562
- bash: "./eng/scripts/install-nginx-mac.sh"
577563
displayName: Installing Nginx
@@ -607,7 +593,7 @@ stages:
607593
agentOs: Linux
608594
isTestingJob: true
609595
useHostedUbuntu: false
610-
buildArgs: --ci --nobl --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
596+
buildArgs: --all --test "/p:RunTemplateTests=false /p:SkipHelixReadyTests=true" $(_InternalRuntimeDownloadArgs)
611597
beforeBuild:
612598
- bash: "./eng/scripts/install-nginx-linux.sh"
613599
displayName: Installing Nginx

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,13 +191,13 @@ jobs:
191191
- ${{ if eq(parameters.steps, '')}}:
192192
- ${{ if eq(parameters.buildScript, '') }}:
193193
- ${{ if eq(parameters.agentOs, 'Windows') }}:
194-
- script: .\$(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
194+
- script: .\$(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
195195
displayName: Run build.cmd
196196
- ${{ if ne(parameters.agentOs, 'Windows') }}:
197-
- script: ./$(BuildDirectory)/build.sh -ci -configuration $(BuildConfiguration) $(BuildScriptArgs)
197+
- script: ./$(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)
198198
displayName: Run build.sh
199199
- ${{ if ne(parameters.buildScript, '') }}:
200-
- script: $(BuildScript) -Configuration $(BuildConfiguration) $(BuildScriptArgs)
200+
- script: $(BuildScript) -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs)
201201
displayName: run $(BuildScript)
202202

203203
- ${{ parameters.afterBuild }}

0 commit comments

Comments
 (0)