Fix shallow merge-base handling for component fixtures - #333604
Open
Henning Dieterichs (hediet) wants to merge 1 commit into
Open
Fix shallow merge-base handling for component fixtures#333604Henning Dieterichs (hediet) wants to merge 1 commit into
Henning Dieterichs (hediet) wants to merge 1 commit into
Conversation
Increase the history depth to 150 and skip screenshot comparison with an explicit warning if the merge base is still unavailable. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 7defd909-5470-4f45-97dc-09706d9c6570
Copilot started reviewing on behalf of
Henning Dieterichs (hediet)
August 31, 2026 17:53
View session
Contributor
There was a problem hiding this comment.
Copilot review overview
Review tier: Balanced
Findings: 1
New issues introduced by this change (1)
| Severity | Finding |
|---|---|
 |
.github/workflows/component-fixtures.yml — When this branch exits without base_sha, the diff is skipped, but the later PR-comment step still… |
What changed in this PR
Improves component-fixture CI resilience when shallow history lacks a merge base.
Changes:
- Increases fetch depth from 50 to 150.
- Warns and skips base-dependent screenshot comparison when necessary.
- Guards base-manifest and diff steps.
| File | Description |
|---|---|
.github/workflows/component-fixtures.yml |
Updates shallow-history and screenshot comparison handling. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+188
to
+190
| if ! BASE_SHA=$(git merge-base "$EVENT_SHA" "$TARGET_REF"); then | ||
| echo "::warning::Unable to find a merge base between $EVENT_SHA and $TARGET_REF. The depth-150 shallow history may not contain their common ancestor; skipping screenshot comparison." | ||
| exit 0 |
Ladislau Szomoru (lszomoru)
approved these changes
Aug 31, 2026
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.
Summary
Increase the component fixture workflow's shallow history depth from 50 to 150 so merge-base lookup tolerates more target-branch activity.
If the merge base is still unavailable, emit an explicit warning and skip only the base-dependent screenshot comparison. Fixture rendering and
blocks-civalidation continue to run.This addresses the silent merge-base failure observed in https://github.com/microsoft/vscode/actions/runs/33221071634/job/99577739911?pr=333236.