Skip to content

Improve build stability by ensuring we aren't double publishing everywhere #27899

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
merged 7 commits into from
Sep 19, 2022
Merged

Improve build stability by ensuring we aren't double publishing everywhere #27899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2de1e0d
Replace all usage of CIBuild so we aren't publishing when we shouldn't.
marcpopMSFT Sep 14, 2022
3c67451
Fix typo
marcpopMSFT Sep 14, 2022
d722dc2
Switch the list of variables into the .vsts-ci file
marcpopMSFT Sep 14, 2022
ba35241
Fix to call the powershell script instead.
marcpopMSFT Sep 14, 2022
f700a43
respond to PR feedback by changing the name to _CIBuild
marcpopMSFT Sep 15, 2022
9bb53ff
Add test variable to the testastool leg
marcpopMSFT Sep 16, 2022
6ee7581
It turns out testastool never had a value for _Test set (checked othe…
marcpopMSFT Sep 16, 2022
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
7 changes: 6 additions & 1 deletion .vsts-ci-richnav.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ stages:
- _SignArgs: ''
- _InternalRuntimeDownloadArgs: ''
steps:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
-restore
-ci
-build
-pack
-sign
-configuration $(_BuildConfig)
$(_PublishArgs)
$(_SignArgs)
Expand Down
2 changes: 2 additions & 0 deletions .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ variables:
value: Roslyn-Project-System
- name: _DotNetPublishToBlobFeed
value: false
- name: _CIBuild
value: -restore -build -sign -pack -ci
- name: _DotNetArtifactsCategory
value: .NETCore
- name: _DotNetValidationArtifactsCategory
Expand Down
2 changes: 0 additions & 2 deletions eng/CIBuild.cmd
View file
Open in desktop

This file was deleted.

19 changes: 12 additions & 7 deletions eng/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ jobs:
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
$(_CIBuild)
-configuration $(_BuildConfig)
$(_PublishArgs)
$(_SignArgs)
Expand Down Expand Up @@ -98,7 +99,8 @@ jobs:
RunAoTTests: 'false'

- ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
$(_CIBuild)
-configuration $(_BuildConfig)
$(_SignArgs)
$(_OfficialBuildIdArgs)
Expand Down Expand Up @@ -128,19 +130,20 @@ jobs:
HelixAccessToken: $(_HelixApiToken)

- ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
$(_CIBuild)
-configuration $(_BuildConfig)
$(_SignArgs)
$(_OfficialBuildIdArgs)
$(_Test)
$(_InternalRuntimeDownloadArgs)
/p:RunTestsAsTool=true
displayName: Build
env:
BuildConfig: $(_BuildConfig)

- ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}:
- script: eng/common/cibuild.sh
- script: eng/common/build.sh
$(_CIBuild)
--configuration $(_BuildConfig)
$(_SignArgs)
$(_OfficialBuildIdArgs)
Expand Down Expand Up @@ -241,7 +244,8 @@ jobs:
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
$(_CIBuild)
-configuration $(_BuildConfig)
$(_SignArgs)
$(_OfficialBuildIdArgs)
Expand Down Expand Up @@ -368,7 +372,8 @@ jobs:
env:
Token: $(dn-bot-dnceng-artifact-feeds-rw)
- ${{ if contains(parameters.agentOs, 'Windows_NT') }}:
- script: eng\CIBuild.cmd
- powershell: eng\common\build.ps1
$(_CIBuild)
-configuration $(_BuildConfig)
$(_SignArgs)
$(_OfficialBuildIdArgs)
Expand Down