Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs#15616
Merged
Disable macOS GitHub Actions jobs by default; opt-in Templates tests on non-PR runs#15616
Conversation
…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
Copilot created this pull request from a session on behalf of
radical
March 26, 2026 08:19
View session
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/microsoft/aspire/main/eng/scripts/get-aspire-cli-pr.sh | bash -s -- 15616Or
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
Contributor
There was a problem hiding this comment.
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
RunOnGithubActionsMacOSdefault from enabled (outside PRs) to disabled everywhere unless explicitly set. - Opt
Aspire.Templates.Testsinto 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. |
JamesNK
approved these changes
Mar 26, 2026
Member
|
/backport to release/13.2 |
Contributor
|
Started backporting to |
Contributor
|
@radical backporting to 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 |
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
eng/Testing.targetsabove theRunOnGithubActionsMacOSdefault📍 Connect Copilot coding agent with Jira, Azure Boards or Linear to delegate work to Copilot in one click without leaving your project management tool.