[windows-macos] Add macos-15-intel to matrix #4455

xmkg · 2025-10-21T08:17:05Z

According to the GH docs, macOS 15 will be the last version that will support Intel. The macos-15 runners will be available until Aug '27.

This patch introduces the macos-15-intel runner to test-drive it.

MULTI-2350

According to the GH docs, macOS 15 will be the last version that will support Intel. The macos-15 runners will be available until Aug '27. This patch introduces the macos-15-intel runner to test-drive it. Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

Copilot

Pull Request Overview

This PR adds support for the macOS 15 Intel runner to the CI matrix, as macOS 15 will be the last version supporting Intel architecture. The change introduces the macos-15-intel runner configuration and marks it as optional to allow the workflow to continue even if this specific job fails.

Adds macos-15-intel runner with x86_64 architecture and mono configuration to the test matrix
Introduces an optional flag to allow the workflow to continue on error for experimental runners
Updates the matrix JSON string to include the new runner configuration

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

brew_extra_pkgs allow specifying additional brew packages to install for a specific matrix configuration. Removed the install nuget step in favor of the new approach. Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

codecov · 2025-10-21T10:03:48Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 89.05%. Comparing base (aa4fda5) to head (17dda67).
⚠️ Report is 34 commits behind head on main.

Additional details and impacted files

@@           Coverage Diff           @@
##             main    #4455   +/-   ##
=======================================
  Coverage   89.05%   89.05%           
=======================================
  Files         240      240           
  Lines       15241    15243    +2     
=======================================
+ Hits        13573    13575    +2     
  Misses       1668     1668

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

github-script allows greater flexibility for manipulating the matrix JSON. Also use more descriptive names for the matrix jobs. Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Pull Request Overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

.github/workflows/windows-macos.yml

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Mustafa Kemal Gılor <mustafagilor@gmail.com>

sharder996 · 2025-10-21T14:36:23Z

Is there a reason why we need to be running Intel macOS-15 runners?

xmkg · 2025-10-21T14:39:18Z

Is there a reason why we need to be running Intel macOS-15 runners?

GitHub's ARM runners do not support nested virtualization, so it's mainly needed for the cli-tests (or any kind of testing that needs to run Multipass VMs on macOS). Also, the macOS-13 Intel runners are deprecated and will be removed this December.

sharder996 · 2025-10-22T05:48:22Z

.github/workflows/windows-macos.yml

+              case job["runs-on"]?.endsWith("-intel"):
+                job.arch = "x86_64";
+                break;
+              case job["runs-on"]?.endsWith("-arm"):


Which runner does this apply to?

sharder996 · 2025-10-22T05:49:05Z

.github/workflows/windows-macos.yml

+              job.mono = "mono"
+
+            switch (true) {
+              case job["runs-on"]?.endsWith("-intel"):


macos-13 should also receive this.

sharder996 · 2025-10-22T05:49:42Z

.github/workflows/windows-macos.yml

+            switch (true) {
+              case job["runs-on"]?.endsWith("-intel"):
+                job.arch = "x86_64";
+                break;
+              case job["runs-on"]?.endsWith("-arm"):
+                job.arch = "arm64";
+                break;
+            }


I think I would rather just manually add this into the above dictionary literal.

Yes, I initially used the name field for this, but the name ended up being changed to a more appealing one. This is a bit overkill and redundant at this point, too.

The weird thing is that the CI passes 🤷 Could that mean the arch is redundant at this point? I'll take a look.

Found the original commit:

bbe964b

So, it seems like GH ARM runners were not a thing back then, so the arch wrapper is basically needed for cross-compiling macOS packages for the different target arch. That's a thing we're no longer doing since the arch-specific packages are being built in their native host environment (i.e., Intel and ARM silicon, respectively).

I'll move the arch vars to each respective JSON node, and submit another PR to remove the arch wrapper altogether.

sharder996 · 2025-10-22T05:52:29Z

Also, the macOS-13 Intel runners are deprecated and will be removed this December.

Good to know. Guess we will need to prioritize backwards compatible macOS builds.

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

xmkg added 3 commits October 21, 2025 11:12

[windows-macos] Add mono to macos-15-intel

515ff64

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

[windows-macos] Mark macos-15-intel as optional

05afb59

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

xmkg requested a review from Copilot October 21, 2025 08:45

Copilot AI reviewed Oct 21, 2025

View reviewed changes

[windows-macos] Add brew_extra_pkgs to matrix cnf

c105390

brew_extra_pkgs allow specifying additional brew packages to install for a specific matrix configuration. Removed the install nuget step in favor of the new approach. Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

xmkg force-pushed the enhancement/add-macos-15-intel-to-gh-runners branch from 591b339 to c105390 Compare October 21, 2025 09:07

[windows-macos] Use github-script for matrix setup

44dcfb6

github-script allows greater flexibility for manipulating the matrix JSON. Also use more descriptive names for the matrix jobs. Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

xmkg force-pushed the enhancement/add-macos-15-intel-to-gh-runners branch from e30c5cb to 44dcfb6 Compare October 21, 2025 10:58

xmkg added 2 commits October 21, 2025 14:00

[windows-macos] Replace # comments with //

6210e32

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

[windows-macos] Use pretty name for BuildAndTest

ac2476e

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

xmkg requested a review from Copilot October 21, 2025 11:11

Copilot AI reviewed Oct 21, 2025

View reviewed changes

xmkg requested review from Copilot and sharder996 October 21, 2025 12:27

xmkg marked this pull request as ready for review October 21, 2025 12:27

Copilot AI reviewed Oct 21, 2025

View reviewed changes

.github/workflows/windows-macos.yml Outdated Show resolved Hide resolved

[windows-macos] Fix typo

6ffb0c9

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Signed-off-by: Mustafa Kemal Gılor <mustafagilor@gmail.com>

sharder996 requested changes Oct 22, 2025

View reviewed changes

[windows-macos] Move macOS arch var to declaration

17dda67

Signed-off-by: Mustafa Kemal Gilor <mustafa.gilor@canonical.com>

[windows-macos] Add macos-15-intel to matrix #4455

Are you sure you want to change the base?

[windows-macos] Add macos-15-intel to matrix #4455

Conversation

xmkg commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

codecov bot commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

sharder996 commented Oct 21, 2025

Uh oh!

xmkg commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

sharder996 Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

sharder996 Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

sharder996 Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

xmkg Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

xmkg Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

xmkg Oct 22, 2025

Choose a reason for hiding this comment

Uh oh!

sharder996 commented Oct 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

xmkg commented Oct 21, 2025 •

edited

Loading

codecov bot commented Oct 21, 2025 •

edited

Loading

xmkg commented Oct 21, 2025 •

edited

Loading