Skip to content

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

Merged
amyblais merged 1 commit into
release-6.3from
chore/cmt-macos-bash-fix-release-6.3
Aug 5, 2026
Merged

ci(cmt): backport macos Bash 3.2 fix + drop legacy runner remap#3934
amyblais merged 1 commit into
release-6.3from
chore/cmt-macos-bash-fix-release-6.3

Conversation

@yasserfaraazkhan

Copy link
Copy Markdown
Contributor

Summary

Manual backport to release-6.3 after automated /cherry-pick of #3920 conflicted.

CMT on v6.3.0-rc.3 (run 30788534920) put every macOS leg on macos-26 (Matterwick v0.4.16+ is fine) but all five failed immediately in e2e/set-required-variables:

ZEPHYR_FOLDER_${RUNNER_OS^^}_REPORT=...: bad substitution

macOS runners ship Bash 3.2, which rejects ${var^^}.

What this PR includes

Source What Why
#3902 (partial) RUNNER_OS_UPPER=$(… | tr …) instead of ${RUNNER_OS^^} Required — unblocks CMT macOS legs
#3920 Drop cmt/normalize-matrix-runners; pass Matterwick matrix through; update schema comments to ubuntu-latest / macos-26 Aligns with Matterwick ≥ v0.4.16 (already sends those runners)

What this PR deliberately does not cherry-pick

Full #3902 (release-channel notify, TSIO pin bumps, BUILD_SUFFIX renames, e2e helper/test changes) — not needed to fix this CMT failure and would widen conflict/risk on release-6.3.

Test plan

  • Merge to release-6.3
  • Manually run CMT Provisioner on release-6.3 (or re-cut / re-dispatch CMT for the 6.3 RC line)
  • Confirm macOS jobs get past e2e/set-required-variables (no bad substitution)
  • Confirm matrix legs use macos-26 / ubuntu-latest / windows-2022
NONE

Made with Cursor

…release-6.3

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>
@mm-cloud-bot mm-cloud-bot added kind/chore Categorizes issue or PR as related to updates that are not production code. release-note-none labels Aug 5, 2026
@coderabbitai

coderabbitai Bot commented Aug 5, 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: e73cfc2d-cc5e-458c-bc23-cfbd360598e9

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.

@amyblais amyblais added this to the v6.3.0 milestone Aug 5, 2026
@amyblais amyblais added the 4: Reviews Complete All reviewers have approved the pull request label Aug 5, 2026
@amyblais
amyblais merged commit 2746028 into release-6.3 Aug 5, 2026
33 checks passed
@amyblais
amyblais deleted the chore/cmt-macos-bash-fix-release-6.3 branch August 5, 2026 10:05
@yasserfaraazkhan yasserfaraazkhan added CherryPick/Candidate A candidate for a quality or patch release, but not yet approved and removed CherryPick/Candidate A candidate for a quality or patch release, but not yet approved labels Aug 11, 2026
amyblais pushed a commit that referenced this pull request Aug 12, 2026
#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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4: Reviews Complete All reviewers have approved the pull request kind/chore Categorizes issue or PR as related to updates that are not production code. release-note-none

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants