fix: align main conflict hotspots with dev for #427#435
Merged
Conversation
mpaulosky
enabled auto-merge (squash)
July 4, 2026 15:53
github-actions
Bot
added
the
squad
Contributor
🏗️ PR Added to Squad Triage QueueThis PR has been labeled with Next steps:
|
There was a problem hiding this comment.
Pull request overview
Aligns main with dev in a few remaining conflict hotspots to unblock PR #427, focusing on CI lint workflows and a small formatting-only change in the AppHost test infrastructure.
Changes:
- Update YAML and Markdown lint workflows to use
actions/checkout@v7and lint only files changed in PRs (while linting all files onworkflow_dispatch). - Switch Markdown lint invocation from
markdownlint-clitomarkdownlint-cli2. - Fix indentation/formatting in
AspireManager.cs(no behavior change).
Reviewed changes
Copilot reviewed 2 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
tests/AppHost.Tests/Infrastructure/AspireManager.cs |
Formatting-only indentation alignment in builder configuration callback. |
.github/workflows/squad-standard-lint-yaml.yml |
Updates checkout action and scopes yamllint to changed YAML files on PRs. |
.github/workflows/squad-standard-lint-markdown.yml |
Updates checkout action, scopes markdown lint to changed files on PRs, and uses markdownlint-cli2. |
Comment on lines
+22
to
+25
| if [ "${{ github.event_name }}" = "pull_request" ]; then | ||
| base_ref="origin/${{ github.base_ref }}" | ||
| git fetch --no-tags --depth=1 origin "${{ github.base_ref }}" | ||
| files=$(git diff --name-only "${base_ref}...HEAD" -- '*.yml' '*.yaml' | tr '\n' ' ') |
Comment on lines
+20
to
+23
| if [ "${{ github.event_name }}" = "pull_request" ]; then | ||
| base_ref="origin/${{ github.base_ref }}" | ||
| git fetch --no-tags --depth=1 origin "${{ github.base_ref }}" | ||
| files=$(git diff --name-only "${base_ref}...HEAD" -- '*.md' | tr '\n' ' ') |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #435 +/- ##
=======================================
Coverage 76.73% 76.73%
=======================================
Files 71 71
Lines 1775 1775
Branches 214 214
=======================================
Hits 1362 1362
Misses 336 336
Partials 77 77 🚀 New features to boost your workflow:
|
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.
Unblocks PR #427 by harmonizing the remaining conflict hotspots in main.
Refs #427