Skip to content

Commit 7241d0d

Browse files
authored
Some pipeline cleanup (#6849)
- Remove unused secrets - PublishUsingPipelines is always true - Fix the internal runtime download location
1 parent 1db8304 commit 7241d0d

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

azure-pipelines.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ variables:
99
# clean the local repo on the build agents
1010
- name: Build.Repository.Clean
1111
value: true
12-
- name: _PublishUsingPipelines
13-
value: true
1412
- name: _DotNetArtifactsCategory
1513
value: WINDOWSDESKTOP
1614
- name: _DotNetValidationArtifactsCategory
@@ -70,13 +68,7 @@ stages:
7068
jobs:
7169
- template: /eng/pipeline.yml
7270
parameters:
73-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
7471
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
75-
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
76-
pool:
77-
name: NetCore1ESPool-Internal
78-
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
79-
# runAsPublic is used in expressions, which can't read from user-defined variables
8072
runAsPublic: false
8173

8274
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

eng/pipeline.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
enablePublishBuildArtifacts: true
2323
enablePublishTestResults: false # tests run in helix
2424
enablePublishBuildAssets: true
25-
enablePublishUsingPipelines: $(_PublishUsingPipelines)
25+
enablePublishUsingPipelines: true
2626
enableTelemetry: true
2727
enableSourceIndex: true
2828
sourceIndexParams:
@@ -82,21 +82,19 @@ jobs:
8282
- name: _InternalRuntimeDownloadArgs
8383
value: ''
8484
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
85-
- group: DotNet-MSRC-Storage
85+
- group: DotNetBuilds storage account read tokens
8686
- group: AzureDevOps-Artifact-Feeds-Pats
8787
- name: _InternalRuntimeDownloadArgs
8888
value: >-
89-
/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
90-
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
89+
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
90+
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
9191
9292
9393
# Override some values if we're building internally
9494
- ${{ if eq(parameters.runAsPublic, 'false') }}:
9595
# note: You have to use list syntax here (- name: value) or you will get errors about declaring the same variable multiple times
9696
- name: _SignType
9797
value: real
98-
- group: DotNet-Blob-Feed
99-
- group: DotNet-Symbol-Server-Pats
10098
- group: DotNet-HelixApi-Access
10199

102100
# note: Even though they are referenced here, user defined variables (like $(_SignType)) are not resolved
@@ -105,8 +103,7 @@ jobs:
105103
- name: _SignArgs
106104
value: /p:DotNetSignType=$(_SignType) /p:TeamName=$(_TeamName)
107105
- name: _PublishArgs
108-
value:
109-
/p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
106+
value: /p:DotNetPublishUsingPipelines=true
110107
- name: _OfficialBuildIdArgs
111108
value: /p:OfficialBuildId=$(BUILD.BUILDNUMBER)
112109
- name: _PublicBuildPipeline

0 commit comments

Comments
 (0)