chore: sync demo into main (replaces PR #259, main content wins, zero file diff)#260
Closed
Shreyas-Microsoft wants to merge 9 commits into
Closed
chore: sync demo into main (replaces PR #259, main content wins, zero file diff)#260Shreyas-Microsoft wants to merge 9 commits into
Shreyas-Microsoft wants to merge 9 commits into
Conversation
build: add cosmos in pyproject
Downmerge main into demo via psl-downmerge-main-to-demo. Resolved src/processor/uv.lock by regenerating with `uv lock` (both branches independently regenerated the lockfile after adding the same azure-cosmos==4.15.0 dependency). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
chore: downmerge main to demo
Shreyas-Microsoft
requested review from
Avijit-Microsoft,
Dongbumlee,
Prajwal-Microsoft,
Roopan-Microsoft,
Vinay-Microsoft,
aniaroramsft,
dgp10801,
nchandhi,
sethsteenken and
toherman-msft
as code owners
Shreyas-Microsoft
temporarily deployed
to
production
GitHub Actions
Inactive
![github-code-quality[bot]](https://avatars.githubusercontent.com/u/9919?s=60&v=4){kind=small}
|
|
||
| // Show the summary page when summary is selected | ||
| if (selectedFile.id === "summary") { | ||
| if (selectedFile.id === "summary" && batchSummary) { |
Processor Coverage Report •
|
Coverage Report •
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR syncs demo branch history into main (as a replacement for #259 with conflicts resolved under the “main wins” policy) while also applying a small set of fixes previously raised in Copilot review, spanning infra parameters, CI coverage path rewriting, and minor frontend safety/lint cleanup.
Changes:
- Fix ARM/Bicep parameter type mismatch by setting
tagsparameter values to an object ({}) instead of an unresolved string placeholder. - Adjust GitHub Actions coverage XML filename rewriting to avoid double-prefixing paths for backend-api and processor coverage reports.
- Frontend cleanup: remove an unused import and add a guard to avoid accessing summary fields when summary data is not available.
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 |
|---|---|
src/frontend/src/pages/batchView.tsx |
Adds an additional guard on the summary render path to avoid null access during render. |
src/frontend/src/components/bottomBar.tsx |
Removes an unused useNavigate import to satisfy linting. |
infra/main.parameters.json |
Sets tags.value to {} to match the Bicep tags object type. |
infra/main.waf.parameters.json |
Sets tags.value to {} to match the Bicep tags object type. |
.github/workflows/test.yml |
Fixes coverage XML filename prefixing logic to prevent duplicated path segments in reports. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Shreyas-Microsoft
force-pushed
the
chore/sync-demo-into-main-pr259
branch
from
d76e4ea to
2743196
Compare
Shreyas-Microsoft
changed the title
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.
Purpose
main → demo), which has merge conflicts. Becausemainis protected and cannot be pushed to directly, this PR follows the requested workflow: branch frommain, mergedemointo it (resolving all conflicts withmainwinning so no demo content is actually introduced), and open the PR in the reverse direction (branch → main) so the change goes through normal review/CI.main, PR chore: Main merge to Demo #259 (main → demo) will be conflict-free becausemainwill fully containdemos history (demo is recorded as a second parent of the merge commit).src/processor/Dockerfile(pure CRLF/LF flip) andsrc/backend-api/uv.lock+src/processor/uv.lock(lockfiles that must stay in sync with the currentpyproject.toml). All three were reset tomains versions during the merge per the "main wins" policy, so this PR has 0 file changes — the merge commits tree is identical tomainat the time of branching. The only purpose of this PR is to recorddemoas a merge parent ofmainso chore: Main merge to Demo #259 stops conflicting.Does this introduce a breaking change?
Golden Path Validation
Deployment Validation
What to Check
Verify that the following are valid
Files changedon this PR is empty (no file diff againstmain).2743196) has bothmain(2870a21) anddemo(082bf29) as parents (git log --merges --pretty='%h %p %s' -1).main → demo) reportsMERGEABLEagain (or can be closed as superseded).Other Information
This PR intentionally introduces no code or config changes; it exists purely to merge
demointomainso the two branches share history again. If a merge with no file changes is undesirable in the repo policy, an alternative is to close #259 and recreate thedemobranch frommaininstead.