Skip to content

Commit

Permalink
Some pipeline cleanup (#6849)
Browse files Browse the repository at this point in the history
- Remove unused secrets
- PublishUsingPipelines is always true
- Fix the internal runtime download location
Rate limit · GitHub

Access has been restricted

You have triggered a rate limit.

Please wait a few minutes before you try again;
in some cases this may take up to an hour.

mmitche authored Aug 3, 2022
1 parent 1db8304 commit 7241d0d
Showing 2 changed files with 5 additions and 16 deletions.
8 changes: 0 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -9,8 +9,6 @@ variables:
# clean the local repo on the build agents
- name: Build.Repository.Clean
value: true
- name: _PublishUsingPipelines
value: true
- name: _DotNetArtifactsCategory
value: WINDOWSDESKTOP
- name: _DotNetValidationArtifactsCategory
@@ -70,13 +68,7 @@ stages:
jobs:
- template: /eng/pipeline.yml
parameters:
enablePublishUsingPipelines: $(_PublishUsingPipelines)
${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
pool:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Pre
# runAsPublic is used in expressions, which can't read from user-defined variables
runAsPublic: false

- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
13 changes: 5 additions & 8 deletions eng/pipeline.yml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ jobs:
enablePublishBuildArtifacts: true
enablePublishTestResults: false # tests run in helix
enablePublishBuildAssets: true
enablePublishUsingPipelines: $(_PublishUsingPipelines)
enablePublishUsingPipelines: true
enableTelemetry: true
enableSourceIndex: true
sourceIndexParams:
@@ -82,21 +82,19 @@ jobs:
- name: _InternalRuntimeDownloadArgs
value: ''
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- group: DotNet-MSRC-Storage
- group: DotNetBuilds storage account read tokens
- group: AzureDevOps-Artifact-Feeds-Pats
- name: _InternalRuntimeDownloadArgs
value: >-
/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet
/p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64)
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
# Override some values if we're building internally
- ${{ if eq(parameters.runAsPublic, 'false') }}:
# note: You have to use list syntax here (- name: value) or you will get errors about declaring the same variable multiple times
- name: _SignType
value: real
- group: DotNet-Blob-Feed
- group: DotNet-Symbol-Server-Pats
- group: DotNet-HelixApi-Access

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

0 comments on commit 7241d0d

Please sign in to comment.