From 2de1e0daaaca92226bff22aa19a55c7072b40071 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Sep 2022 09:33:18 -0700 Subject: [PATCH 1/7] Replace all usage of CIBuild so we aren't publishing when we shouldn't. --- .vsts-ci-richnav.yml | 7 ++++++- eng/CIBuild.cmd | 2 -- eng/build.yml | 22 +++++++++++++++------- 3 files changed, 21 insertions(+), 10 deletions(-) delete mode 100644 eng/CIBuild.cmd diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml index e78a8d02cf48..db0b164bc2c4 100644 --- a/.vsts-ci-richnav.yml +++ b/.vsts-ci-richnav.yml @@ -52,7 +52,12 @@ stages: - _SignArgs: '' - _InternalRuntimeDownloadArgs: '' steps: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + -restore + -ci + -build + -pack + -sign -configuration $(_BuildConfig) $(_PublishArgs) $(_SignArgs) diff --git a/eng/CIBuild.cmd b/eng/CIBuild.cmd deleted file mode 100644 index 5bb05a4c5ed6..000000000000 --- a/eng/CIBuild.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" -restore -build -sign -pack -ci %*" \ No newline at end of file diff --git a/eng/build.yml b/eng/build.yml index f144a5626d15..b568d3decce7 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -6,7 +6,9 @@ parameters: pool: {} # Additional variables - variables: {} + variables: + - name: CIBuild + value: -restore -build -sign -pack -ci # Build strategy - matrix strategy: '' @@ -67,7 +69,8 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + $(CIBuild) -configuration $(_BuildConfig) $(_PublishArgs) $(_SignArgs) @@ -98,7 +101,8 @@ jobs: RunAoTTests: 'false' - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -128,7 +132,8 @@ jobs: HelixAccessToken: $(_HelixApiToken) - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -140,7 +145,8 @@ jobs: 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) @@ -241,7 +247,8 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -368,7 +375,8 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if contains(parameters.agentOs, 'Windows_NT') }}: - - script: eng\CIBuild.cmd + - script: eng\common\build.cmd + $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) From 3c67451f4ebb851496afd1e03d2463144890a3d2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Sep 2022 09:34:37 -0700 Subject: [PATCH 2/7] Fix typo --- eng/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.yml b/eng/build.yml index b568d3decce7..08712e1202f0 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -8,7 +8,7 @@ parameters: # Additional variables variables: - name: CIBuild - value: -restore -build -sign -pack -ci + value: -restore -build -sign -pack -ci # Build strategy - matrix strategy: '' From d722dc232b1881b9e9109d37622ac02ba46ebe7e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Sep 2022 15:05:23 -0700 Subject: [PATCH 3/7] Switch the list of variables into the .vsts-ci file --- .vsts-ci.yml | 2 ++ eng/build.yml | 14 ++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 623fca90b0f7..4e58f274b952 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -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 diff --git a/eng/build.yml b/eng/build.yml index 08712e1202f0..e4d114826cfd 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -6,9 +6,7 @@ parameters: pool: {} # Additional variables - variables: - - name: CIBuild - value: -restore -build -sign -pack -ci + variables: {} # Build strategy - matrix strategy: '' @@ -69,7 +67,7 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 $(CIBuild) -configuration $(_BuildConfig) $(_PublishArgs) @@ -101,7 +99,7 @@ jobs: RunAoTTests: 'false' - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) @@ -132,7 +130,7 @@ jobs: HelixAccessToken: $(_HelixApiToken) - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) @@ -247,7 +245,7 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) @@ -375,7 +373,7 @@ jobs: env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if contains(parameters.agentOs, 'Windows_NT') }}: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 $(CIBuild) -configuration $(_BuildConfig) $(_SignArgs) From ba35241502cae7dc9e6470b7bfe78765ffb4095e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Sep 2022 16:38:59 -0700 Subject: [PATCH 4/7] Fix to call the powershell script instead. --- .vsts-ci-richnav.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml index db0b164bc2c4..4b82e4c1e211 100644 --- a/.vsts-ci-richnav.yml +++ b/.vsts-ci-richnav.yml @@ -52,7 +52,7 @@ stages: - _SignArgs: '' - _InternalRuntimeDownloadArgs: '' steps: - - script: eng\common\build.cmd + - powershell: eng\common\build.ps1 -restore -ci -build From f700a43f12d2014b8e4b7e02498ab698c6491c9b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Sep 2022 15:18:27 -0700 Subject: [PATCH 5/7] respond to PR feedback by changing the name to _CIBuild --- .vsts-ci.yml | 2 +- eng/build.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 4e58f274b952..8f1aad2901e4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -18,7 +18,7 @@ variables: value: Roslyn-Project-System - name: _DotNetPublishToBlobFeed value: false - - name: CIBUILD + - name: _CIBuild value: -restore -build -sign -pack -ci - name: _DotNetArtifactsCategory value: .NETCore diff --git a/eng/build.yml b/eng/build.yml index e4d114826cfd..4d862f6f57c8 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -68,7 +68,7 @@ jobs: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 - $(CIBuild) + $(_CIBuild) -configuration $(_BuildConfig) $(_PublishArgs) $(_SignArgs) @@ -100,7 +100,7 @@ jobs: - ${{ if eq(parameters.agentOs, 'Windows_NT_FullFramework') }}: - powershell: eng\common\build.ps1 - $(CIBuild) + $(_CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -131,7 +131,7 @@ jobs: - ${{ if eq(parameters.agentOs, 'Windows_NT_TestAsTools') }}: - powershell: eng\common\build.ps1 - $(CIBuild) + $(_CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -144,7 +144,7 @@ jobs: - ${{ if notIn(parameters.agentOs, 'Windows_NT', 'Windows_NT_FullFramework', 'Windows_NT_TestAsTools') }}: - script: eng/common/build.sh - $(CIBuild) + $(_CIBuild) --configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -246,7 +246,7 @@ jobs: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 - $(CIBuild) + $(_CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) @@ -374,7 +374,7 @@ jobs: Token: $(dn-bot-dnceng-artifact-feeds-rw) - ${{ if contains(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 - $(CIBuild) + $(_CIBuild) -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) From 9bb53ff3ece829858a789f8a2f92e6d160112043 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Sep 2022 09:43:28 -0700 Subject: [PATCH 6/7] Add test variable to the testastool leg --- .vsts-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 8f1aad2901e4..53c6e2cc80eb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -133,6 +133,7 @@ stages: _BuildConfig: Debug _PublishArgs: '' _SignType: test + _Test: -test - template: /eng/build.yml parameters: From 6ee7581ac0c4d72ff15399907616b110d97fd0e2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Sep 2022 10:45:15 -0700 Subject: [PATCH 7/7] It turns out testastool never had a value for _Test set (checked other PR builds) so I'm going to go ahead and remove it as a parameter. --- .vsts-ci.yml | 1 - eng/build.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 53c6e2cc80eb..8f1aad2901e4 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -133,7 +133,6 @@ stages: _BuildConfig: Debug _PublishArgs: '' _SignType: test - _Test: -test - template: /eng/build.yml parameters: diff --git a/eng/build.yml b/eng/build.yml index 4d862f6f57c8..d84e640811ed 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -135,7 +135,6 @@ jobs: -configuration $(_BuildConfig) $(_SignArgs) $(_OfficialBuildIdArgs) - $(_Test) $(_InternalRuntimeDownloadArgs) /p:RunTestsAsTool=true displayName: Build