ci(cmt): drop legacy runner remapping after Matterwick v0.4.16 by yasserfaraazkhan · Pull Request #3920 · mattermost/desktop

yasserfaraazkhan · 2026-07-28T05:22:59Z

Summary

Matterwick #93 / v0.4.16 now emits ubuntu-latest + macos-26 for desktop CMT
Remove the CMT workflow's legacy label remapping (macos-13/14/ubuntu-22.04) — pass the matrix through as-is
Update schema/comments to match current runners
Leave PR E2E macos-latest → macos-26 pin in e2e-functional.yml (Matterwick PR path still sends macos-latest)

Test plan

Confirm gitops#78 is merged and Matterwick rolled to v0.4.16
Manually run CMT Provisioner and confirm matrix legs use macos-26 / ubuntu-latest with no remapping step
Confirm PR E2E still remaps macos-latest → macos-26

Release Note

NONE

Change Impact: 🟡 Medium

Regression Risk: Changes CI runner-matrix handling and may affect CMT or PR E2E execution if runner availability or matrix inputs are incompatible.
QA Recommendation: Manual verification of CMT matrix runners and PR E2E remapping is recommended.
Generated by CodeRabbitAI

Matterwick now sends ubuntu-latest / macos-26 / windows-2022 directly, so the CMT matrix pass-through no longer rewrites retired labels. Co-authored-by: Cursor <cursoragent@cursor.com>

mm-cloud-bot · 2026-07-28T05:23:03Z

@yasserfaraazkhan: Adding the "do-not-merge/release-note-label-needed" label because no release-note block was detected, please follow our release note process to remove it.

Details

I understand the commands that are listed here

coderabbitai · 2026-07-28T05:23:18Z

📝 Walkthrough

Walkthrough

The compatibility workflow now forwards CMT_MATRIX unchanged, updates downstream matrix references, and documents current runner expectations. The e2e template comment now uses the updated macOS and server version examples.

Changes

Compatibility matrix workflows

Layer / File(s)	Summary
Pass through compatibility matrix inputs `.github/workflows/compatibility-matrix-testing.yml`, `.github/workflows/e2e-functional-template.yml`	The workflow replaces runner normalization with direct `CMT_MATRIX` pass-through, updates dependent steps, and refreshes runner and version examples in comments.

Estimated code review effort: 2 (Simple) | ~10 minutes

Suggested labels: release-note-none

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly summarizes the main change: removing legacy CMT runner remapping after Matterwick v0.4.16.

✨ Finishing Touches

📝 Generate docstrings

Create stacked PR
Commit on current branch

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch chore/cmt-drop-legacy-runner-remap

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

yasserfaraazkhan · 2026-08-05T09:27:25Z

Hi @amyblais
Please let me know if we can cherry pick this PR to the 6.3.0.
it has fixes for errors on macos runner

amyblais · 2026-08-05T09:37:54Z

Please let me know if we can cherry pick this PR to the 6.3.0. it has fixes for errors on macos runner

@yasserfaraazkhan Sounds good.

amyblais · 2026-08-05T09:38:05Z

/cherry-pick release-6.3

mattermost-build · 2026-08-05T09:38:08Z

Cherry pick is scheduled.

mattermost-build · 2026-08-05T09:38:10Z

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/desktop
   7cfa731e..193236e2  release-6.2  -> upstream/release-6.2
   ed4eae31..3fe39519  release-6.3  -> upstream/release-6.3
 * [new tag]           v6.2.3-rc.1  -> v6.2.3-rc.1
 * [new tag]           v6.3.0-mas.1 -> v6.3.0-mas.1
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.3-1785922689
Switched to a new branch 'automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.3-1785922689'
Branch 'automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.3-1785922689' set up to track remote branch 'release-6.3' from 'upstream'.

+++ About to attempt cherry pick of PR #3920 with merge commit dd4f35b8aed1f16054093b1bdd4029b41e30639e.

Auto-merging .github/workflows/compatibility-matrix-testing.yml
CONFLICT (content): Merge conflict in .github/workflows/compatibility-matrix-testing.yml
Auto-merging .github/workflows/e2e-functional-template.yml
error: could not apply dd4f35b8... ci(cmt): drop legacy runner remapping after Matterwick v0.4.16 (#3920)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU .github/workflows/compatibility-matrix-testing.yml
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

amyblais · 2026-08-05T09:38:36Z

@yasserfaraazkhan Can you help open a manual cherry-pick PR to release-6.3 branch?

…release-6.3 (#3934) CMT on v6.3.0-rc.3 failed every macos-26 leg in e2e/set-required-variables with `bad substitution` from `${RUNNER_OS^^}` (Bash 3.2). Port the tr-based uppercase from #3902 and the Matterwick v0.4.16 matrix pass-through from #3920 without the rest of those PRs' master-only changes. Co-authored-by: Cursor <cursoragent@cursor.com>

yasserfaraazkhan · 2026-08-12T02:55:06Z

/cherry-pick release-6.2

mattermost-build · 2026-08-12T02:55:08Z

Cherry pick is scheduled.

mattermost-build · 2026-08-12T02:55:11Z

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/desktop
   e436d733..b6ee8d57  MM-67519            -> upstream/MM-67519
 * [new branch]        add-calls-e2e-tests -> upstream/add-calls-e2e-tests
   30e980c5..2d71af1b  release-6.2         -> upstream/release-6.2
 * [new tag]           v6.2.3-rc.2         -> v6.2.3-rc.2
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.2-1786503310
Switched to a new branch 'automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.2-1786503310'
Branch 'automated-cherry-pick-of-chore-cmt-drop-legacy-runner-remap-release-6.2-1786503310' set up to track remote branch 'release-6.2' from 'upstream'.

+++ About to attempt cherry pick of PR #3920 with merge commit dd4f35b8aed1f16054093b1bdd4029b41e30639e.

Auto-merging .github/workflows/compatibility-matrix-testing.yml
CONFLICT (content): Merge conflict in .github/workflows/compatibility-matrix-testing.yml
Auto-merging .github/workflows/e2e-functional-template.yml
CONFLICT (content): Merge conflict in .github/workflows/e2e-functional-template.yml
error: could not apply dd4f35b8... ci(cmt): drop legacy runner remapping after Matterwick v0.4.16 (#3920)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

+++ Conflicts detected:

UU .github/workflows/compatibility-matrix-testing.yml
UU .github/workflows/e2e-functional-template.yml
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

#3944) release-6.2 CMT Provisioner only had workflow_dispatch (no RC tag push), so v6.2.3-rc.* never auto-triggered Matterwick. Port the RC-tag trigger from #3846, the Bash 3.2 Zephyr env fix needed for macos-26 CMT legs, and update matrix schema comments for Matterwick ≥ v0.4.16 (#3920). Automated cherry-picks conflicted; same approach as #3934 on release-6.3. Co-authored-by: Cursor <cursoragent@cursor.com>

ci(cmt): drop legacy runner remapping after Matterwick v0.4.16

d5b16dd

Matterwick now sends ubuntu-latest / macos-26 / windows-2022 directly, so the CMT matrix pass-through no longer rewrites retired labels. Co-authored-by: Cursor <cursoragent@cursor.com>

mm-cloud-bot added the kind/chore Categorizes issue or PR as related to updates that are not production code. label Jul 28, 2026

mm-cloud-bot added the do-not-merge/release-note-label-needed label Jul 28, 2026

github-actions Bot added the E2E/Run Run Desktop E2E Tests label Jul 28, 2026

mm-cloud-bot added release-note-none and removed do-not-merge/release-note-label-needed labels Jul 28, 2026

yasserfaraazkhan removed the release-note-none label Jul 28, 2026

mm-cloud-bot added the release-note-none label Jul 28, 2026

coderabbitai Bot approved these changes Jul 28, 2026

View reviewed changes

yasserfaraazkhan requested a review from devinbinnie July 28, 2026 05:31

yasserfaraazkhan enabled auto-merge (squash) July 28, 2026 05:34

github-actions Bot removed the E2E/Run Run Desktop E2E Tests label Jul 28, 2026

yasserfaraazkhan requested a review from saturninoabril July 29, 2026 23:23

saturninoabril approved these changes Jul 30, 2026

View reviewed changes

yasserfaraazkhan merged commit dd4f35b into master Jul 30, 2026
57 checks passed

yasserfaraazkhan deleted the chore/cmt-drop-legacy-runner-remap branch July 30, 2026 00:19

yasserfaraazkhan mentioned this pull request Aug 5, 2026

ci(cmt): backport macos Bash 3.2 fix + drop legacy runner remap #3934

Merged

4 tasks

yasserfaraazkhan mentioned this pull request Aug 12, 2026

ci(cmt): backport RC-tag trigger and macOS Bash 3.2 fix to release-6.2 #3944

Merged

6 tasks

coderabbitai Bot mentioned this pull request Aug 13, 2026

ci(e2e): unique CMT failure counts + restore per-OS commit statuses #3945

Merged

4 tasks

Navigation Menu

Uh oh!

ci(cmt): drop legacy runner remapping after Matterwick v0.4.16 - #3920

ci(cmt): drop legacy runner remapping after Matterwick v0.4.16#3920
yasserfaraazkhan merged 1 commit into
masterfrom
chore/cmt-drop-legacy-runner-remap

yasserfaraazkhan commented Jul 28, 2026 •

edited

Loading

Uh oh!

mm-cloud-bot commented Jul 28, 2026

Uh oh!

coderabbitai Bot commented Jul 28, 2026 •

edited

Loading

Walkthrough

Changes

Uh oh!

Uh oh!

yasserfaraazkhan commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

mattermost-build commented Aug 5, 2026

Uh oh!

mattermost-build commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

yasserfaraazkhan commented Aug 12, 2026

Uh oh!

mattermost-build commented Aug 12, 2026

Uh oh!

mattermost-build commented Aug 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Uh oh!

Conversation

yasserfaraazkhan commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Release Note

Change Impact: 🟡 Medium

Uh oh!

mm-cloud-bot commented Jul 28, 2026

Uh oh!

coderabbitai Bot commented Jul 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Changes

Uh oh!

Uh oh!

yasserfaraazkhan commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

mattermost-build commented Aug 5, 2026

Uh oh!

mattermost-build commented Aug 5, 2026

Uh oh!

amyblais commented Aug 5, 2026

Uh oh!

yasserfaraazkhan commented Aug 12, 2026

Uh oh!

mattermost-build commented Aug 12, 2026

Uh oh!

mattermost-build commented Aug 12, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

yasserfaraazkhan commented Jul 28, 2026 •

edited

Loading

coderabbitai Bot commented Jul 28, 2026 •

edited

Loading