Skip to content

Commit 9f9ac7b

Browse files
authored
Remove some dead/unnecessary build steps (#91634)
1 parent a3a0f5c commit 9f9ac7b

File tree

5 files changed

+2
-71
lines changed

5 files changed

+2
-71
lines changed

eng/empty.csproj

Lines changed: 0 additions & 17 deletions
This file was deleted.

eng/pipelines/common/templates/runtimes/send-to-helix-inner-step.yml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
parameters:
22
osGroup: ''
3-
restoreParams: ''
43
sendParams: ''
54
condition: ''
65
displayName: ''
@@ -9,28 +8,14 @@ parameters:
98

109
steps:
1110
- ${{ if eq(parameters.osGroup, 'windows') }}:
12-
# TODO: Remove and consolidate this when we move to arcade via init-tools.cmd.
13-
- powershell: $(Build.SourcesDirectory)\eng\common\build.ps1 -ci -warnaserror 0 ${{ parameters.restoreParams }}
14-
displayName: Restore blob feed tasks (Windows)
15-
condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }})
16-
17-
- powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 -ci -warnaserror 0 ${{ parameters.sendParams }}
11+
- powershell: $(Build.SourcesDirectory)\eng\common\msbuild.ps1 --restore -ci -warnaserror 0 ${{ parameters.sendParams }}
1812
displayName: ${{ parameters.displayName }} (Windows)
1913
condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }})
2014
env: ${{ parameters.environment }}
2115
continueOnError: ${{ eq(parameters.shouldContinueOnError, true) }}
2216

2317
- ${{ if ne(parameters.osGroup, 'windows') }}:
24-
# TODO: Remove and consolidate this when we move to arcade via init-tools.sh.
25-
- script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --warnaserror false ${{ parameters.restoreParams }}
26-
displayName: Restore blob feed tasks (Unix)
27-
condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.restoreParams, '')) }})
28-
${{ if eq(parameters.osGroup, 'freebsd') }}:
29-
env:
30-
# Arcade uses this SDK instead of trying to restore one.
31-
DotNetCoreSdkDir: /usr/local/dotnet
32-
33-
- script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --ci --warnaserror false ${{ parameters.sendParams }}
18+
- script: $(Build.SourcesDirectory)/eng/common/msbuild.sh --restore --ci --warnaserror false ${{ parameters.sendParams }}
3419
displayName: ${{ parameters.displayName }} (Unix)
3520
condition: and(succeeded(), ${{ and(ne(parameters.condition, false), ne(parameters.sendParams, '')) }})
3621
env: ${{ parameters.environment }}

eng/pipelines/common/templates/runtimes/send-to-helix-step.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ steps:
3939
- template: send-to-helix-inner-step.yml
4040
parameters:
4141
osGroup: ${{ parameters.osGroup }}
42-
restoreParams: /p:DotNetPublishToBlobFeed=true -restore -projects $(Build.SourcesDirectory)$(dir)eng$(dir)empty.csproj
4342
sendParams: ${{ parameters.helixProjectArguments }} ${{ parameters.msbuildParallelism }} /bl:$(Build.SourcesDirectory)/artifacts/log/SendToHelix.binlog /p:TargetArchitecture=${{ parameters.archType }} /p:TargetOS=${{ parameters.osGroup }} /p:TargetOSSubgroup=${{ parameters.osSubgroup }} /p:Configuration=${{ parameters.buildConfig }}
4443
condition: and(succeeded(), ${{ parameters.condition }})
4544
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}

eng/pipelines/coreclr/templates/build-job.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,6 @@ jobs:
7070
value: ''
7171
- name: publishLogsArtifactPrefix
7272
value: 'BuildLogs_CoreCLR'
73-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
74-
# Variables used to publish packages to blob feed
75-
- name: dotnetfeedUrl
76-
value: https://dotnetfeed.blob.core.windows.net/dotnet-coreclr/index.json
77-
- name: dotnetfeedPAT
78-
value: $(dotnetfeed-storage-access-key-1)
79-
# Variables used by arcade to gather asset manifests
80-
- name: _DotNetPublishToBlobFeed
81-
value: true
8273
- name: officialBuildIdArg
8374
value: ''
8475
- ${{ if eq(parameters.isOfficialBuild, true) }}:
@@ -278,14 +269,6 @@ jobs:
278269
artifactName: $(nativeTestArtifactName)
279270
displayName: 'native test components'
280271

281-
# Get key vault secrets for publishing
282-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), ne(variables['Build.Reason'], 'PullRequest')) }}:
283-
- task: AzureKeyVault@1
284-
inputs:
285-
azureSubscription: 'DotNet-Engineering-Services_KeyVault'
286-
KeyVaultName: EngKeyVault
287-
SecretsFilter: 'dotnetfeed-storage-access-key-1,microsoft-symbol-server-pat,symweb-symbol-server-pat'
288-
289272
# Save packages using the prepare-signed-artifacts format.
290273
- ${{ if and(eq(parameters.isOfficialBuild, true), eq(parameters.pgoType, '')) }}:
291274
- template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml

eng/pipelines/mono/templates/build-job.yml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -171,25 +171,6 @@ jobs:
171171
- script: build$(scriptExt) -subset mono+clr.hosts -c $(buildConfig) -arch $(archType) $(osOverride) -ci $(officialBuildIdArg) $(aotCrossParameter) $(llvmParameter) -pack $(OutputRidArg)
172172
displayName: Build nupkg
173173

174-
# Publish official build
175-
- ${{ if eq(parameters.publishToBlobFeed, 'true') }}:
176-
- ${{ if ne(parameters.osGroup, 'windows') }}:
177-
- script: $(Build.SourcesDirectory)/eng/common/build.sh --ci --restore --publish --configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)/artifacts/log/publish-pkgs.binlog" --projects $(Build.SourcesDirectory)/eng/empty.csproj
178-
displayName: Publish packages to blob feed
179-
env:
180-
# TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
181-
NUGET_PACKAGES: $(Build.SourcesDirectory)/.packages
182-
${{ if eq(parameters.osGroup, 'freebsd') }}:
183-
# Arcade uses this SDK instead of trying to restore one.
184-
DotNetCoreSdkDir: /usr/local/dotnet
185-
- ${{ if eq(parameters.osGroup, 'windows') }}:
186-
# TODO: pass publish feed url and access token in from the internal pipeline
187-
- powershell: eng\common\build.ps1 -ci -restore -publish -configuration $(_BuildConfig) /p:DotNetPublishUsingPipelines=true /p:DotNetPublishToBlobFeed=true /p:DotNetPublishBlobFeedUrl=$(dotnetfeedUrl) /p:DotNetPublishBlobFeedKey=$(dotnetfeedPAT) /p:Configuration=$(_BuildConfig) /p:TargetArchitecture=$(archType) /p:TargetOS=$(osGroup) /p:OSIdentifier=$(osGroup)$(osSubgroup) /bl:"$(Build.SourcesDirectory)\artifacts\log\publish-pkgs.binlog" -projects $(Build.SourcesDirectory)\eng\empty.csproj
188-
displayName: Publish packages to blob feed
189-
env:
190-
# TODO: remove NUGET_PACKAGES once https://github.com/dotnet/arcade/issues/1578 is fixed
191-
NUGET_PACKAGES: $(Build.SourcesDirectory)\.packages
192-
193174
# Publish Logs
194175
- task: PublishPipelineArtifact@1
195176
displayName: Publish Logs

0 commit comments

Comments
 (0)