Skip to content

chore(release): preserve main ancestry in dev for PR #352#358

Merged
mpaulosky merged 3 commits into
devfrom
squad/355-merge-main-into-dev-release-unblock
May 23, 2026
Merged

chore(release): preserve main ancestry in dev for PR #352#358
mpaulosky merged 3 commits into
devfrom
squad/355-merge-main-into-dev-release-unblock

Conversation

@mpaulosky

Copy link
Copy Markdown
Owner

Closes #357

Summary

Validation

  • local pre-push gate passed on git push
  • dotnet restore MyBlog.slnx
  • dotnet build MyBlog.slnx -c Release --no-restore
  • dotnet test MyBlog.slnx -c Release --no-build

mpaulosky and others added 3 commits May 8, 2026 07:43
## 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.
## Sprint 18 — AppHost MongoDB Dev Commands Refactor

This release promotes all Sprint 18 work from `dev` to `main`.

### What's included

#### Feature work
- **#262** — `refactor(apphost): extract WithClearDatabaseCommand into
MongoDbResourceBuilderExtensions`
- **#263** — `feat(AppHost): add WithSeedDataCommand for local dev
seeding`
- **#264** — `feat(AppHost): add WithShowStatsCommand for local dev
stats`
- **#267** — `refactor: rename _clearMutex to _dbMutex in
MongoDbResourceBuilderExtensions`

#### CI fixes
- **#270** — `fix(ci): Blog → README Sync — push to dev instead of main`
- **#271** — `fix(ci): add pre-flight token validation and fix
permissions block in squad-mark-released`

### CI status

- ✅ **Squad CI** (`ci.yml`) — green on latest `dev` commit
- ⚠️ **Test Suite** — 1 flaky test failure: `SeedMyBlogData Concurrent
Invocations Allow Only One Run` (timing-sensitive concurrency test; race
condition in test harness, not production code). All other 47 tests
pass. Squad CI gate is the authoritative pass/fail gate.

### Notes

- Last release tag: `v1.5.0`
- `dev` is 55 commits ahead of `main`
- No open Sprint 18 issues, no open PRs
- Merge strategy: squash merge per playbook

---

## Release Checklist

- [ ] Latest `dev` Squad CI is green ✅
- [ ] Release scope reviewed (Sprint 18 milestone closed, all 4 issues
merged)
- [ ] Breaking changes documented (none — additive AppHost extension
methods only)
- [ ] Flaky test acknowledged (`SeedMyBlogData Concurrent` — timing race
in test, not prod)
- [ ] Release notes drafted (see sprint summary above)
- [ ] Aragorn approval received
- [ ] Boromir confirms branch state and workflow health
- [ ] PR CI passes before merge
- [ ] Merge to `main` with squash merge
- [ ] Tag `main` with appropriate `vX.Y.Z` after merge + CI green

Closes the Sprint 18 release gate.
Working as Boromir (DevOps)

---------

Co-authored-by: Boromir <boromir@squad.dev>
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Resolve the remaining dev/main conflicts with main preserved as a merge parent so release PR #352 can become mergeable.

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

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 added the squad Squad triage inbox — Lead will assign to a member label May 23, 2026
@github-actions

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

Copy link
Copy Markdown
Contributor

Test Results Summary

480 tests  ±0   479 ✅ ±0   31s ⏱️ -1s
  6 suites ±0     1 💤 ±0 
  6 files   ±0     0 ❌ ±0 

Results for commit 3b1f1dc. ± Comparison against base commit bf8919a.

@codecov

codecov Bot commented May 23, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.86%. Comparing base (bf8919a) to head (3b1f1dc).

Additional details and impacted files
@@           Coverage Diff           @@
##              dev     #358   +/-   ##
=======================================
  Coverage   79.86%   79.86%           
=======================================
  Files          68       68           
  Lines        1659     1659           
  Branches      201      201           
=======================================
  Hits         1325     1325           
  Misses        244      244           
  Partials       90       90           
🚀 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 merged commit e0a46c6 into dev May 23, 2026
20 checks passed
@mpaulosky
mpaulosky deleted the squad/355-merge-main-into-dev-release-unblock branch May 23, 2026 21:57
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.

[Sprint 19] Preserve main ancestry in dev to unblock release PR #352

2 participants