feat(preprod): Add PR comments for snapshot base-build edge cases#115460
Merged
Conversation
Align PR comment logic with status check logic so that all three base-build edge cases post comments instead of silently returning: no base_sha posts "Generated N snapshots", missing base posts "Waiting for base snapshots...", and timeout posts "No base snapshots found". Co-Authored-By: Claude Opus 4.6 <noreply@example.com>
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 9c9ea42. Configure here.
First-upload with base_sha would post "Waiting..." but no timeout was scheduled, leaving the comment stuck. Now routes first uploads to the solo comment like the status check does. Also ensure existing "Waiting" comments get updated to the normal diff view when base arrives with no changes, instead of silently returning. Co-Authored-By: Claude Opus 4 <noreply@anthropic.com>
rbro112
approved these changes
May 13, 2026
NicoHinderling
added a commit
to getsentry/sentry-cli
that referenced
this pull request
May 13, 2026
There is no valid scenario where a snapshot uploaded as part of a PR should lack a base SHA — without it, the server cannot identify which base build to compare against. Previously this was silently accepted, leading to orphaned "solo" snapshots that could never produce diffs. This adds client-side validation that bails early with an actionable error message before any images are uploaded or API calls are made. The error points users to either pass `--base-sha` explicitly or ensure their CI environment exposes the merge base. Companion to getsentry/sentry#115446, getsentry/sentry#115448, and getsentry/sentry#115460 which handle the server/UI side of base-build edge cases.
3 tasks
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.

Align PR comment logic with status check logic for three base-build edge cases that previously caused the PR comment task to silently return:
base_sha(e.g. PR without a merge target) — now posts a comment showing uploaded snapshot counts with a message explaining diffs will appear once a base upload existsbase_shabut no matching base build yet — posts a "Waiting for base snapshots..." comment that auto-updates within ~10 minutesThese three scenarios were already handled gracefully by the status check task (added in #115448). The PR comment task was the gap — it would hit the
has_changes/has_failuresgate and return without posting anything.Changes:
snapshot_templates.py— Three new format functions (format_solo_snapshot_pr_comment,format_waiting_for_base_snapshot_pr_comment,format_missing_base_snapshot_pr_comment) sharing a_format_solo_commenthelper and message constants. Extracted_format_settings_linkto DRY the existing function.snapshot_tasks.py(PR comment task) — Addedis_solodetection before thehas_changes/has_failuresgate, routing to the correct template based onbase_shapresence and whether this is a timeout invocation. The existing diff path moves into anelsebranch.status_checks/snapshots/tasks.py— Thewaiting_for_basetimeout block now also schedules a delayedcreate_preprod_snapshot_pr_comment_taskwith the same 600s countdown, so the PR comment updates to "missing base" if the base never arrives.Builds on #115448 which added the grace period to the status check side.