Skip to content

Drop stale secret group - #14710

Merged
rainersigwald merged 2 commits into
mainfrom
exp/drop-stale-secret-group
Aug 16, 2026
Merged

rainersigwald merged 2 commits into
mainfrom
exp/drop-stale-secret-group

Conversation

@rainersigwald

Copy link
Copy Markdown
Member

Fix the official build by removing this group that should no longer be needed after dotnet/arcade#17245. Similar to dotnet/arcade#17259.

Exp job was an easy test and got past the failure point: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=14979069

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: f3daa6dc-c4da-488a-afcf-37b45c444e01
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: f3daa6dc-c4da-488a-afcf-37b45c444e01
@rainersigwald
rainersigwald requested a review from a team as a code owner August 14, 2026 21:53
Copilot AI lite review requested due to automatic review settings August 14, 2026 21:53
@rainersigwald
rainersigwald enabled auto-merge (squash) August 14, 2026 21:55

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR removes references to the AzureDevOps-Artifact-Feeds-Pats variable group from MSBuild’s Azure Pipelines YAML definitions to unblock official builds after upstream Arcade changes removed/obsoleted that secret group.

Changes:

  • Removed the AzureDevOps-Artifact-Feeds-Pats variable group from the exp perf pipeline variables.
  • Removed the AzureDevOps-Artifact-Feeds-Pats variable group from the official .vsts-dotnet.yml variables.
  • Removed the conditional AzureDevOps-Artifact-Feeds-Pats variable group import from the CI pipeline.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
azure-pipelines/.vsts-dotnet-exp-perf.yml Drops the stale secret variable group from the exp perf pipeline variables list.
.vsts-dotnet.yml Drops the stale secret variable group from the official pipeline variables list.
.vsts-dotnet-ci.yml Removes the DevDiv-only variable-group import for the stale secret group.

💡 Add a code-review agent skill for context-aware, tailored reviews. Learn more in the docs.

@github-actions github-actions Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ 24/24 dimensions clean — no findings.

This removes an obsolete variable group AzureDevOps-Artifact-Feeds-Pats from the ExpPerf pipeline. The full file was checked — no remaining pipeline steps reference variables from this group, so the removal is safe.

Warning

Firewall blocked 1 domain

The following domain was blocked by the firewall during workflow execution:

  • patchdiff.githubusercontent.com

To allow these domains, add them to the network.allowed list in your workflow frontmatter:

network:
  allowed:
    - defaults
    - "patchdiff.githubusercontent.com"

See Network Configuration for more information.

Generated by Expert Code Review (on open) for #14710 · sonnet46 · 29.2 AIC · ⌖ 7.46 AIC · ⊞ 5.3K

@rainersigwald
rainersigwald merged commit b6d968a into main Aug 16, 2026
17 of 18 checks passed
@rainersigwald
rainersigwald deleted the exp/drop-stale-secret-group branch August 16, 2026 16:23
@ViktorHofer

Copy link
Copy Markdown
Member

/backport to vs16.11

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to vs16.11 (link to workflow run)

@github-actions

Copy link
Copy Markdown
Contributor

@ViktorHofer backporting to vs16.11 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git cherry-pick b6d968a085d1010fd04b7a65d3adb1684d297153

Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
Auto-merging .vsts-dotnet.yml
CONFLICT (content): Merge conflict in .vsts-dotnet.yml
Auto-merging azure-pipelines/.vsts-dotnet-exp-perf.yml
error: could not apply b6d968a08... Drop stale secret group (#14710)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove obsolete artifact feeds variable group
Using index info to reconstruct a base tree...
M	.vsts-dotnet-ci.yml
M	.vsts-dotnet.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
Auto-merging .vsts-dotnet.yml
CONFLICT (content): Merge conflict in .vsts-dotnet.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove obsolete artifact feeds variable group
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

@ViktorHofer

Copy link
Copy Markdown
Member

/backport to vs17.8

@github-actions

Copy link
Copy Markdown
Contributor

Started backporting to vs17.8 (link to workflow run)

@github-actions

Copy link
Copy Markdown
Contributor

@ViktorHofer backporting to vs17.8 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git cherry-pick b6d968a085d1010fd04b7a65d3adb1684d297153

Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
Auto-merging .vsts-dotnet.yml
CONFLICT (content): Merge conflict in .vsts-dotnet.yml
Auto-merging azure-pipelines/.vsts-dotnet-exp-perf.yml
error: could not apply b6d968a08... Drop stale secret group (#14710)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Remove obsolete artifact feeds variable group
Using index info to reconstruct a base tree...
M	.vsts-dotnet-ci.yml
M	.vsts-dotnet.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-dotnet-ci.yml
CONFLICT (content): Merge conflict in .vsts-dotnet-ci.yml
Auto-merging .vsts-dotnet.yml
CONFLICT (content): Merge conflict in .vsts-dotnet.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove obsolete artifact feeds variable group
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

ViktorHofer added a commit that referenced this pull request Aug 17, 2026
The AzureDevOps-Artifact-Feeds-Pats variable group is no longer active and
referencing it breaks the official build. It is no longer needed after
dotnet/arcade#17245.

Port of #14710 to this servicing branch.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8527d316-639a-4568-9560-43af8df52c15
ViktorHofer added a commit that referenced this pull request Aug 17, 2026
…4718)

Ports #14710 (commit
b6d968a) to this servicing branch.

The `AzureDevOps-Artifact-Feeds-Pats` variable group is no longer
active, and referencing it fails the official build. It is no longer
needed after dotnet/arcade#17245.

`$(dn-bot-dnceng-artifact-feeds-rw)` is still consumed by the `Setup
Private Feeds Credentials` steps and is now provided without this group,
matching `main`.

### Why only one file here

Unlike `main`, this branch references the group in exactly one place.
Its `.vsts-dotnet-ci.yml` and `.vsts-dotnet.yml` predate the group being
added, so there is nothing to remove there. This change therefore fully
removes the group from `vs16.11`.

### Other branches

This commit also fully covers `vs17.8`, which has the same single
reference, so `vs17.8` needs no separate PR and is handled by merge
flow.

`vs17.11` and everything newer reference the group in all three files
and are handled by #14719, which is a complete self-contained port of
#14710.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8527d316-639a-4568-9560-43af8df52c15
ViktorHofer added a commit that referenced this pull request Aug 17, 2026
…4719)

Ports #14710 (commit
b6d968a) to this servicing branch.

The `AzureDevOps-Artifact-Feeds-Pats` variable group is no longer
active, and referencing it fails the official build. It is no longer
needed after dotnet/arcade#17245.

`$(dn-bot-dnceng-artifact-feeds-rw)` is still consumed by the `Setup
Private Feeds Credentials` steps and is now provided without this group,
matching `main`. In `.vsts-dotnet-ci.yml` the surrounding `${{ if
eq(variables['System.TeamProject'], 'DevDiv') }}` block is removed too,
since it would otherwise be empty.

This is a complete, self-contained port: the same three files and four
deletions as #14710, so this branch is fixed on its own without waiting
for merge flow.

### Other branches

`vs16.11` only ever referenced the group in
`azure-pipelines/.vsts-dotnet-exp-perf.yml` (its other two pipeline
files predate the group being added), so it gets a one-file fix in
#14718, which also fully covers `vs17.8`.

Branches newer than this one (`vs17.12`, `vs17.14`, `vs18.0`, `vs18.6`,
`vs18.8`, `vs18.9`, `vs18.10`) all match this branch exactly. This
commit cherry-picks cleanly onto each of them and leaves zero
references, so they are covered by merge flow and need no separate PR.

The overlapping deletion in `.vsts-dotnet-exp-perf.yml` shared with
#14718 merges cleanly (both sides remove the same line); verified that a
`vs17.8` -> `vs17.11` forward-flow merge produces no conflict in any of
the three pipeline files.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot-Session: 8527d316-639a-4568-9560-43af8df52c15
This was referenced Nov 16, 2026

This branch was previously deployed

1 inactive deployment
copilot-pat-pool — bbdf2664 Deployed Aug 14, 2026 by rainersigwald via conclusion #656
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants