Skip to content

Commit 3147799

Browse files
committed
Don't publish the unsigned build if we're not doing post-build signing. We'll publish from the signing job.
1 parent 4937671 commit 3147799

File tree

1 file changed

+27
-29
lines changed

1 file changed

+27
-29
lines changed

.azure/pipelines/ci.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,13 @@ variables:
4444
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
4545
- name: PostBuildSign
4646
value: false
47+
- name: _ArcadePublishNonWindowsArg
48+
value: ''
4749
- ${{ else }}:
4850
- name: PostBuildSign
4951
value: true
52+
- name: _ArcadePublishNonWindowsArg
53+
value: --publish
5054
- name: _UseHelixOpenQueues
5155
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
5256
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -315,7 +319,7 @@ extends:
315319
--pack
316320
--all
317321
--no-build-java
318-
--publish
322+
$(_ArcadePublishNonWindowsArg)
319323
-p:OnlyPackPlatformSpecificPackages=true
320324
-p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
321325
$(_BuildArgs)
@@ -345,7 +349,7 @@ extends:
345349
--pack
346350
--all
347351
--no-build-java
348-
--publish
352+
$(_ArcadePublishNonWindowsArg)
349353
-p:OnlyPackPlatformSpecificPackages=true
350354
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
351355
$(_BuildArgs)
@@ -371,18 +375,15 @@ extends:
371375
jobDisplayName: "Build: Linux x64"
372376
agentOs: Linux
373377
useHostedUbuntu: false
374-
steps:
375-
- script: ./eng/build.sh
376-
--ci
377-
--arch x64
378-
--pack
379-
--all
380-
--build-installers
381-
--no-build-java
382-
-p:OnlyPackPlatformSpecificPackages=true
383-
$(_BuildArgs)
384-
$(_InternalRuntimeDownloadArgs)
385-
displayName: Run build.sh
378+
buildArgs:
379+
--arch x64
380+
--pack
381+
--all
382+
--build-installers
383+
--no-build-java
384+
-p:OnlyPackPlatformSpecificPackages=true
385+
$(_BuildArgs)
386+
$(_InternalRuntimeDownloadArgs)
386387
artifacts:
387388
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
388389
path: artifacts/log/
@@ -407,7 +408,7 @@ extends:
407408
--pack
408409
--all
409410
--no-build-java
410-
--publish
411+
$(_ArcadePublishNonWindowsArg)
411412
-p:OnlyPackPlatformSpecificPackages=true
412413
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
413414
$(_BuildArgs)
@@ -432,17 +433,14 @@ extends:
432433
jobName: Linux_arm64_build
433434
jobDisplayName: "Build: Linux ARM64"
434435
agentOs: Linux
435-
steps:
436-
- script: ./eng/build.sh
437-
--ci
438-
--arch arm64
439-
--pack
440-
--all
441-
--no-build-java
442-
-p:OnlyPackPlatformSpecificPackages=true
443-
$(_BuildArgs)
444-
$(_InternalRuntimeDownloadArgs)
445-
displayName: Run build.sh
436+
buildArgs:
437+
--arch arm64
438+
--pack
439+
--all
440+
--no-build-java
441+
-p:OnlyPackPlatformSpecificPackages=true
442+
$(_BuildArgs)
443+
$(_InternalRuntimeDownloadArgs)
446444
artifacts:
447445
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
448446
path: artifacts/log/
@@ -469,7 +467,7 @@ extends:
469467
--pack
470468
--all
471469
--no-build-java
472-
--publish
470+
$(_ArcadePublishNonWindowsArg)
473471
-p:OnlyPackPlatformSpecificPackages=true
474472
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
475473
$(_BuildArgs)
@@ -503,7 +501,7 @@ extends:
503501
--pack
504502
--all
505503
--no-build-java
506-
--publish
504+
$(_ArcadePublishNonWindowsArg)
507505
-p:OnlyPackPlatformSpecificPackages=true
508506
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
509507
$(_BuildArgs)
@@ -536,7 +534,7 @@ extends:
536534
--pack
537535
--all
538536
--no-build-java
539-
--publish
537+
$(_ArcadePublishNonWindowsArg)
540538
-p:OnlyPackPlatformSpecificPackages=true
541539
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
542540
$(_BuildArgs)

0 commit comments

Comments
 (0)