Skip to content

Commit 69db530

Browse files
aspire-repo-bot[bot]adamintCopilot
authored
[release/13.5] Remove pipeline-scoped Publish-Build-Assets group (#19523)
* Remove pipeline-scoped Publish-Build-Assets group Co-authored-by: Copilot App <[email protected]> * Pin Azure Identity for VSCE installs Co-authored-by: Copilot App <[email protected]> Copilot-Session: dbe46f58-0f31-4540-a647-0d0e77bea4f1 * Clarify pipeline workaround conditions Co-authored-by: Copilot App <[email protected]> Copilot-Session: dbe46f58-0f31-4540-a647-0d0e77bea4f1 * Document VSCE dependency pin Co-authored-by: Copilot App <[email protected]> Copilot-Session: dbe46f58-0f31-4540-a647-0d0e77bea4f1 --------- Co-authored-by: Adam Ratzman <[email protected]> Co-authored-by: Copilot App <[email protected]> Copilot-Session: dbe46f58-0f31-4540-a647-0d0e77bea4f1
1 parent 6ee87f7 commit 69db530

6 files changed

Lines changed: 22 additions & 16 deletions

File tree

‎eng/pipelines/azure-pipelines-codeql.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ jobs:
7474
inputs:
7575
targetType: 'inline'
7676
script: |
77-
npm install -g @vscode/[email protected]
77+
# Pin Azure Identity explicitly so VSCE's transitive dependency graph
78+
# remains stable across npm feed updates.
79+
npm install -g @vscode/[email protected] @azure/[email protected]
7880
vsce --version
7981
workingDirectory: '$(Build.SourcesDirectory)'
8082

‎eng/pipelines/azure-pipelines-unofficial.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,9 @@ extends:
226226
inputs:
227227
targetType: 'inline'
228228
script: |
229-
npm install -g @vscode/[email protected]
229+
# Pin Azure Identity explicitly so VSCE's transitive dependency graph
230+
# remains stable across npm feed updates.
231+
npm install -g @vscode/[email protected] @azure/[email protected]
230232
vsce --version
231233
workingDirectory: '$(Build.SourcesDirectory)'
232234

‎eng/pipelines/azure-pipelines.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -505,13 +505,12 @@ extends:
505505
# not recognized."
506506
enableMicrobuild: true
507507
enablePublishUsingPipelines: true
508-
# Asset_Registry_Publish (BAR publish) needs MaestroAccessToken from
509-
# the Publish-Build-Assets variable group, which is only loaded on
510-
# main / release / internal-release branches because of the AzDO
511-
# ACL on that group. Skip the publish job entirely on contributor
512-
# branches so jobs.yml does not inject Asset_Registry_Publish and
513-
# fail at runtime for a missing token (and so the assemble stage
514-
# does not trip an additional 1ES Branch control checkpoint).
508+
# Asset_Registry_Publish (BAR publish) loads Publish-Build-Assets at
509+
# job scope for MaestroAccessToken. The group has an AzDO ACL for
510+
# main / release / internal-release branches, so skip the publish
511+
# job entirely on contributor branches. This avoids injecting a job
512+
# that cannot load its token and prevents another 1ES Branch control
513+
# checkpoint on the assemble stage.
515514
${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
516515
enablePublishBuildAssets: true
517516
publishAssetsImmediately: true

‎eng/pipelines/common-variables.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@ variables:
4040
# scope causes 1ES to inject a per-stage Branch control check that blocks
4141
# every stage on contributor branches before any work can start.
4242
#
43-
# Only the BAR publish job (assemble stage's Asset_Registry_Publish) and
44-
# helix telemetry actually need these tokens, and neither runs as a real
45-
# publish on a contributor branch. Skip the group load when we're not on
46-
# a branch the ACLs accept so manual / non-PR builds on ankj/* etc. can
47-
# still validate the rest of the pipeline (including signing).
43+
# Helix telemetry and Guardian/SDL tooling use these tokens. Skip the
44+
# group load when we're not on a branch the ACLs accept so manual /
45+
# non-PR builds on ankj/* etc. can still validate the rest of the
46+
# pipeline (including signing).
4847
- ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
4948
- group: DotNet-HelixApi-Access
5049
- group: SDL_Settings

‎eng/pipelines/release-publish-nuget.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2186,7 +2186,9 @@ extends:
21862186
- pwsh: |
21872187
$ErrorActionPreference = 'Stop'
21882188
2189-
npm install -g @vscode/[email protected] --registry https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
2189+
# Pin Azure Identity explicitly so VSCE's transitive dependency graph
2190+
# remains stable across npm feed updates.
2191+
npm install -g @vscode/[email protected] @azure/[email protected] --registry https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
21902192
vsce --version
21912193
displayName: 'Install vsce'
21922194

‎eng/pipelines/templates/build_extension.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ jobs:
7474
inputs:
7575
targetType: 'inline'
7676
script: |
77-
npm install -g @vscode/[email protected]
77+
# Pin Azure Identity explicitly so VSCE's transitive dependency graph
78+
# remains stable across npm feed updates.
79+
npm install -g @vscode/[email protected] @azure/[email protected]
7880
vsce --version
7981
workingDirectory: '$(Build.SourcesDirectory)'
8082

0 commit comments

Comments
 (0)