Skip to content

merge(main): reconcile release PR #254 conflicts#256

Merged
mpaulosky merged 2 commits into
devfrom
squad/254-resolve-release-conflicts
May 8, 2026
Merged

merge(main): reconcile release PR #254 conflicts#256
mpaulosky merged 2 commits into
devfrom
squad/254-resolve-release-conflicts

Conversation

@mpaulosky

Copy link
Copy Markdown
Owner

Summary

  • merge main into dev to resolve the dirty merge state blocking release PR [RELEASE] Promote dev to main #254
  • preserve the current dev versions of conflicting workflow, package, doc, and test files
  • keep AppHost.Tests collection parallelism disabled during the sync

Links

Validation

  • pre-push hook passed on squad/254-resolve-release-conflicts during push

mpaulosky and others added 2 commits April 30, 2026 07:10
- complete the xUnit v3 rollout across the remaining test projects\n- carry forward the AppHost/Playwright test fixes and release workflow updates\n- include Sprint 7/8 ADRs and retrospectives for the migration\n\nCo-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
- reconcile main into dev to unblock release PR #254
- preserve current dev-side workflow, package, test, and AppHost settings
- keep AppHost.Tests collection parallelism disabled during sync

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings May 8, 2026 14:27

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Copilot wasn't able to review any files in this pull request.

@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown
Contributor

🏗️ PR Added to Squad Triage Queue

This PR has been labeled with squad and added to the triage queue.

Next steps:

  • The squad Lead will review and assign to an appropriate team member
  • A squad:member label will be added after triage

If you know which squad member should handle this, you can add the appropriate squad:member label yourself.

@github-actions github-actions Bot added the squad Squad triage inbox — Lead will assign to a member label May 8, 2026
@github-actions

github-actions Bot commented May 8, 2026

Copy link
Copy Markdown
Contributor

Test Results Summary

314 tests  ±0   313 ✅ ±0   18s ⏱️ -1s
  6 suites ±0     1 💤 ±0 
  6 files   ±0     0 ❌ ±0 

Results for commit 719fc0a. ± Comparison against base commit 91d3788.

@mpaulosky
mpaulosky merged commit 0dc7e88 into dev May 8, 2026
18 checks passed
@mpaulosky
mpaulosky deleted the squad/254-resolve-release-conflicts branch May 8, 2026 14:32
@codecov

codecov Bot commented May 8, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.01%. Comparing base (91d3788) to head (719fc0a).
⚠️ Report is 3 commits behind head on dev.

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #256   +/-   ##
=======================================
  Coverage   83.01%   83.01%           
=======================================
  Files          43       43           
  Lines         730      730           
  Branches      112      112           
=======================================
  Hits          606      606           
  Misses         81       81           
  Partials       43       43           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@mpaulosky mpaulosky mentioned this pull request May 8, 2026
4 tasks
mpaulosky added a commit that referenced this pull request May 8, 2026
## Release Checklist
- [x] Latest dev CI is green on `0dc7e88`
- [x] Release scope reviewed
- [x] No breaking changes identified
- [x] Release notes drafted

## Release Scope
- Sprint 14 — Board Automation Reliability (#215, #238, #239, #240,
#244)
- Sprint 15 — Local Mongo Clear Command (#246, #247, #248, #249, #252)
- Supporting squad maintenance, docs, lint, dependency, and test updates
already merged into `dev` since PR #213
- Sync PR #256 merged `main` into `dev` to clear the release conflicts
on this PR

## Release Notes
- Sprint 14 ships board automation hardening, theme toggle/theme
selector persistence fixes, workspace skill cleanup, and higher Web
project coverage.
- Sprint 15 ships the local-only AppHost `clear-myblog-data` command
plus Mongo clear hardening and test coverage.
- This release also includes accumulated docs, test-migration, lint, and
maintenance updates already validated on `dev`.

## Notes
- Sprint 15 milestone was closed during release prep because it had 0
open issues.
- PR #256 reconciled `main` into `dev` with a merge commit so this
release PR is mergeable again.
- This PR promotes the current `dev` branch to `main` per the
release-only branch model.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

squad Squad triage inbox — Lead will assign to a member

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants