Repository navigation
Remove Publish-Build-Assets variable group from main - #37589
Conversation
Remove the broad VG20 import and synchronize the relevant Arcade template cleanup. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: e890b71a-c1aa-416c-a15c-be8da9fdd9b4
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 37589Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 37589" |
|
Hey there @@missymessa! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
|
Hey there @missymessa! Thank you so much for your PR! Someone from the team will get assigned to your PR shortly and we'll get it reviewed. |
There was a problem hiding this comment.
Pull request overview
This PR removes the Publish-Build-Assets Azure Pipelines variable group import from the MAUI pipeline/template layer, aligning main with the referenced Arcade credential-removal work.
Changes:
- Removed
Publish-Build-Assetsvariable group imports from common variables and core-templates jobs. - Removed several previously-redacted secret variables from the log redaction token list.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| eng/pipelines/common/variables.yml | Removes Publish-Build-Assets from the main pipeline variables import list. |
| eng/common/core-templates/steps/publish-logs.yml | Drops removed credentials from the redaction token list passed to the log redactor. |
| eng/common/core-templates/post-build/common-variables.yml | Removes the Publish-Build-Assets variable group import from post-build variables. |
| eng/common/core-templates/jobs/codeql-build.yml | Removes the Publish-Build-Assets variable group import from the CodeQL job template. |
| eng/common/core-templates/job/publish-build-assets.yml | Removes the Publish-Build-Assets variable group import from the publish-assets job path. |
Suppressed comments (1)
eng/pipelines/common/variables.yml:84
- The conditional variable insertion for
Build.DefinitionName == dotnet-mauiis now empty after removing the variable group. Azure Pipelines template condition blocks must expand to at least one entry; leaving an empty conditional can cause YAML/template validation errors.
- ${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}:
PR #37589 removed `- group: Publish-Build-Assets`, which was the only child of the `${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}` conditional, but left the now-empty conditional header behind. Azure DevOps requires a conditional insertion block to contain at least one entry, so the internal `dotnet-maui` pipeline failed to compile with: /eng/pipelines/common/variables.yml (Line: 81, Col: 7): Expected at least one key-value pair in the mapping The public `maui-pr` definition was unaffected because the outer guard only matches the `dotnet-maui` / `dotnet-maui-build` definition names, so the block was never expanded there. No other file references the `Publish-Build-Assets` variable group, so the conditional is removed entirely rather than repopulated. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
) <!-- Please let the below note in for people that find this PR --> > [!NOTE] > Are you waiting for the changes in this PR to be merged? > It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you! ### Problem The internal `dotnet-maui` official build currently fails to compile the pipeline YAML, before any stage runs: ``` /eng/pipelines/common/variables.yml (Line: 81, Col: 7): Expected at least one key-value pair in the mapping ``` ### Cause #37589 removed `- group: Publish-Build-Assets`, but that group was the only child of the conditional that enclosed it, leaving an empty block behind: ```yaml - group: AzureDevOps-Artifact-Feeds-Pats - ${{ if eq(variables['Build.DefinitionName'], 'dotnet-maui') }}: # <- nothing under it ``` Azure DevOps requires a conditional insertion block to contain at least one entry, so template expansion fails outright. ### Why PR validation stayed green The empty block is nested inside an outer guard: ```yaml - ${{ if or(eq(variables['Build.DefinitionName'], 'dotnet-maui'), eq(variables['Build.DefinitionName'], 'dotnet-maui-build')) }}: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: ``` For the public `maui-pr` definition that outer condition is false, so Azure DevOps short-circuits and never expands the inner block. The breakage is therefore invisible to PR CI and only manifests on the internal official build. ### Fix Remove the empty conditional. No file in the repository references the `Publish-Build-Assets` variable group any more, so it is deleted outright rather than repopulated. ### Validation - `eng/pipelines/common/variables.yml` parses as valid YAML. - Swept all 39 YAML files under `eng/pipelines/` for conditional blocks with no body — this was the only one. - `grep` for `Publish-Build-Assets` across `eng/` and `.github/` returns no remaining references. This blocks the internal build entirely, so it is worth merging ahead of larger infra work such as #36257 (which carries the same one-line fix, but cannot be validated on the internal pipeline until this is on `main`). Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Removes the repository-owned VG20 import and synchronizes the relevant Arcade credential-removal changes on
main.Tracked by https://dev.azure.com/dnceng/internal/_workitems/edit/12131