Add feature branch support - #2190
Open
lbussell wants to merge 12 commits into
Open
Conversation
Pushing feature/<name> now queues the official pipeline and publishes images under a <name> tag prefix, so they don't collide with the tags built from main. Feature builds are unsigned and skip versions-repo image info, Kusto ingestion, and publish notifications. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: 052ad3ab-a412-4fc2-81c0-cff74e53a766
lbussell
force-pushed
the
lbussell/feature-branches
branch
from
July 27, 2026 20:56
cf095cd to
cc5d170
Compare
mthalman
approved these changes
Jul 29, 2026
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Contributor
There was a problem hiding this comment.
Pull request overview
Adds feature-branch support for building/publishing the ImageBuilder container image, including branch-triggered official pipeline runs, feature-scoped tagging, and a helper script to discover feature branches and published images.
Changes:
- Introduces manifest-level variables to support tag prefixing and a branch-specific “latest-like” tag.
- Updates the official pipeline and ImageBuilder pipeline variables to build
feature/*branches and publish under feature-derived tags. - Adds
eng/Get-FeatureBranches.ps1and documents feature-branch publishing in the repo README.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
src/manifest.json |
Adds TagPrefix/LatestTag variables and prefixes all tags to enable feature-branch publishing without collisions. |
README.md |
Documents that feature/* branches are published and points to the discovery script. |
eng/pipelines/templates/variables/image-builder.yml |
Adds branch-conditional manifest variables and disables official record ingestion for feature builds. |
eng/pipelines/dotnet-buildtools-image-builder-official.yml |
Extends CI trigger to include feature/* branches. |
eng/Get-FeatureBranches.ps1 |
New script to list feature branches and corresponding published images/timestamps. |
Comment on lines
+18
to
+19
| ImageBuilder images are published from the `main` branch as well as `feature/*` branches. | ||
| Run [`pwsh eng/Get-FeatureBranches.ps1`](./eng/Get-FeatureBranches.ps1) to see all available feature branches |
Comment on lines
44
to
+48
| "os": "windows", | ||
| "osVersion": "windowsservercore-ltsc2019", | ||
| "tags": { | ||
| "windowsservercore-ltsc2016-amd64": {}, | ||
| "windowsservercore-ltsc2016-amd64-$(UniqueId)": {} | ||
| "$(TagPrefix)windowsservercore-ltsc2016-amd64": {}, | ||
| "$(TagPrefix)windowsservercore-ltsc2016-amd64-$(UniqueId)": {} |
Comment on lines
+41
to
+43
| - ${{ else }}: | ||
| - name: manifestVariables | ||
| value: --var UniqueId=${{ parameters.sourceBuildPipelineRunId }} |
Comment on lines
+45
to
+48
| foreach ($ref in git ls-remote --heads $Remote 'refs/heads/feature/*') { | ||
| $branch = ($ref -split "`t")[1] -replace '^refs/heads/', '' | ||
| $branches[(ConvertTo-FeatureName $branch)] = $branch | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes #649.
feature/*branches are automatically built when there are new changes.feature/foois published asmcr.microsoft.com/dotnet-buildtools/image-builder:foo-$tagwhere$tagis the regular tag.Get-FeatureBranches.ps1which lists all feature branches across git + mcr.microsoft.com.