Skip to content

Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs#15616

Merged
radical merged 2 commits intomainfrom
copilot/disable-macos-jobs-for-prs
Mar 26, 2026
Merged

Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs#15616
radical merged 2 commits intomainfrom
copilot/disable-macos-jobs-for-prs

Conversation

Copy link
Copy Markdown
Contributor

Copilot AI commented Mar 26, 2026


📍 Connect Copilot coding agent with Jira, Azure Boards or Linear to delegate work to Copilot in one click without leaving your project management tool.

Copilot AI requested a review from radical March 26, 2026 08:19
@radical radical marked this pull request as ready for review March 26, 2026 08:20
@radical radical requested a review from eerhardt as a code owner March 26, 2026 08:20
Copilot AI review requested due to automatic review settings March 26, 2026 08:20
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 26, 2026

🚀 Dogfood this PR with:

⚠️ WARNING: Do not do this without first carefully reviewing the code of this PR to satisfy yourself it is safe.

curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 15616

Or

  • Run remotely in PowerShell:
iex "& { $(irm https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.ps1) } 15616"

Co-authored-by: radical <1472+radical@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/aspire/sessions/4d11feba-f6cf-44d8-ba5a-f8db859bef2b
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates the repo’s CI test-matrix defaults so macOS GitHub Actions coverage is opt-in rather than opt-out, and selectively enables macOS for template tests on non-PR GitHub Actions runs.

Changes:

  • Change RunOnGithubActionsMacOS default from enabled (outside PRs) to disabled everywhere unless explicitly set.
  • Opt Aspire.Templates.Tests into macOS runs only on GitHub Actions non-PR builds.
  • Update CI documentation to reflect the new macOS-default-off behavior and show an opt-in pattern.

Reviewed changes

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

File Description
tests/Aspire.Templates.Tests/Aspire.Templates.Tests.csproj Opts template tests into macOS only for GitHub Actions non-PR runs.
eng/Testing.targets Makes macOS runs disabled-by-default via RunOnGithubActionsMacOS fallback.
docs/ci/TestingOnCI.md Documents new default behavior and adds an example macOS opt-in condition.

Comment thread docs/ci/TestingOnCI.md
@radical radical enabled auto-merge (squash) March 26, 2026 09:43
Copy link
Copy Markdown
Member

@joperezr joperezr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@radical radical merged commit 80f67b0 into main Mar 26, 2026
501 of 504 checks passed
@radical radical deleted the copilot/disable-macos-jobs-for-prs branch March 26, 2026 18:54
@radical
Copy link
Copy Markdown
Member

radical commented Mar 26, 2026

/backport to release/13.2

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/13.2 (link to workflow run)

@aspire-repo-bot
Copy link
Copy Markdown
Contributor

@radical backporting to release/13.2 failed, the patch most likely resulted in conflicts. Please backport manually!

git am output
$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs
Using index info to reconstruct a base tree...
M	eng/Testing.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/Testing.targets
CONFLICT (content): Merge conflict in eng/Testing.targets
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

adamint pushed a commit to adamint/aspire that referenced this pull request Mar 28, 2026
…on non-PR runs (microsoft#15616)

* Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs

Co-authored-by: radical <1472+radical@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/aspire/sessions/e4b29c17-8a89-4125-9f02-69f645df4085

* Reference issue microsoft#15615 in Testing.targets

Co-authored-by: radical <1472+radical@users.noreply.github.com>
Agent-Logs-Url: https://github.com/microsoft/aspire/sessions/4d11feba-f6cf-44d8-ba5a-f8db859bef2b

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: radical <1472+radical@users.noreply.github.com>
@joperezr joperezr added this to the 13.3 milestone Apr 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants