Skip to content

Cherry-pick of #3945 to release-6.3 - #3947

Merged
yasserfaraazkhan merged 2 commits into
release-6.3from
cursor/cherry-pick-3945-release-6.3-45d5
Aug 14, 2026
Merged

Cherry-pick of #3945 to release-6.3#3947
yasserfaraazkhan merged 2 commits into
release-6.3from
cursor/cherry-pick-3945-release-6.3-45d5

Conversation

@yasserfaraazkhan

@yasserfaraazkhan yasserfaraazkhan commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Cherry pick of #3945 on release-6.3.

Restores per-OS GitHub commit statuses (e2e/linux, e2e/macos, e2e/windows, plus e2e/macos-policy / e2e/windows-policy on PR/master). CMT still keeps the e2e/compatibility-matrix-testing umbrella.

Also cherry-picks #3923 so required e2e/<os> checks can pass on this branch. release-6.3 still has the pre-11.10 MM-T4054 fixture; CMT on release-6.3 HEAD already fails MM-T4054 on server 11.10.0 only. Master is green because it already has #3923. This is a test-only change (e2e/specs/mattermost/media_preview.test.ts).

Summary

  • Collapse TSIO history attempts per spec/job so a failed-then-retried test counts as one failure (or flaky if it later passed). Helpers live in e2e/utils/cmt-channel-notify.js (needed for per-OS aggregation).
  • Prefer unique per-leg totals when flipping e2e/<os> checks from TSIO.
  • Restore per-OS GitHub commit statuses for PR/master and CMT.
  • Cherry-pick e2e: fix MM-T4054 media preview failure on Mattermost 11.10.0-rc2 #3923: wait for a loaded non-placeholder file-preview control before opening MM-T4054 (Mattermost 11.10 / MM-69174).

Ticket Link

Cherry-pick of #3945
Also includes #3923 (needed for required E2E checks vs server 11.10.0)

Checklist

Device Information

This PR was tested on: unit tests via node --test e2e/utils/cmt-channel-notify.test.js e2e/utils/tsio-report-status.test.js (40 passed)

Release Note

NONE

Backport notes

Automated cherry-pick conflicted because release-6.3 does not have channel-notify wiring from #3902.

What this PR includes:

What this PR does not enable:

  • Mattermost channel webhook posts (MATTERMOST_*_WEBHOOK_URL not wired on this branch; unique CMT headline counts only apply once channel notify is present)

Merge gate: after this push, re-add the E2E/Run label so Matterwick dispatches Playwright against the new HEAD (e733a294). Do not merge until e2e/linux, e2e/macos, and e2e/windows are successful on that SHA.

Open in Web Open in Cursor 

…3945)

(cherry picked from commit 4eea1e5)

Co-authored-by: yasser khan <attitude3cena.yf@gmail.com>
@coderabbitai

coderabbitai Bot commented Aug 14, 2026

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 2d4c65a8-523e-4361-b977-3f1fe7aac6fe

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Comment @coderabbitai help to get the list of available commands.

@yasserfaraazkhan
yasserfaraazkhan marked this pull request as ready for review August 14, 2026 06:25
@yasserfaraazkhan yasserfaraazkhan added the E2E/Run Run Desktop E2E Tests label Aug 14, 2026
@github-actions github-actions Bot removed the E2E/Run Run Desktop E2E Tests label Aug 14, 2026
@amyblais amyblais added this to the v6.3.0 milestone Aug 14, 2026
@yasserfaraazkhan yasserfaraazkhan added E2E/Reset-Servers Destroy E2E server for a fresh Run. Add E2E/Run label to kick off an e2e run. and removed E2E/Reset-Servers Destroy E2E server for a fresh Run. Add E2E/Run label to kick off an e2e run. labels Aug 14, 2026
@yasserfaraazkhan yasserfaraazkhan added the E2E/Run Run Desktop E2E Tests label Aug 14, 2026
@github-actions github-actions Bot removed the E2E/Run Run Desktop E2E Tests label Aug 14, 2026
@yasserfaraazkhan
yasserfaraazkhan merged commit ddb1338 into release-6.3 Aug 14, 2026
39 checks passed
@yasserfaraazkhan
yasserfaraazkhan deleted the cursor/cherry-pick-3945-release-6.3-45d5 branch August 14, 2026 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants