Skip to content

chore: converge CountryService protected branches#43

Merged
natthapolvanasrivilai merged 4 commits into
developfrom
codex/countryservice-convergence
Jul 19, 2026
Merged

chore: converge CountryService protected branches#43
natthapolvanasrivilai merged 4 commits into
developfrom
codex/countryservice-convergence

Conversation

@natthapolvanasrivilai

Copy link
Copy Markdown
Contributor

Outcome

Converges develop onto the exact reviewed CountryService tree already promoted to main by #38, while retaining both branch histories.

Integrity

  • Result tree SHA: 421c1bef6dbcc7468512e45f9f56a9352ed0830e
  • Result tree is byte-identical to current main (16d99ec97014363c2d4121fd6ec99c671cdf1e8c).
  • Preserves the complete 219-commit Clean Architecture feature history from develop and the three newer main maintenance commits.
  • Replaces old branch deployment workflows with the reviewed validation-only workflow set; no image publication or GitOps/environment mutation.

Validation

  • dotnet restore Maliev.CountryService.slnx --locked-mode: passed.
  • Release build: 0 warnings, 0 errors.
  • Full tests: 263/263 passed.
  • dotnet format --verify-no-changes: passed.
  • Transitive NuGet vulnerability audit: no vulnerable packages.
  • Actionlint: passed.
  • Gitleaks current-tree scan: no leaks.
  • Historical-only documentation examples remain in inherited history but are absent from the current tree; no history rewrite is performed.
  • Existing exact-main validation run 29648370578: green.

Safety boundary

No deployment, GCP/GKE/IAM/secrets change, image publication, GitOps write, or database operation.

Adds weekly grouped minor/patch updates with bounded limits for NuGet, Docker, and GitHub Actions. Policy schema and repository paths were validated on the exact PR head. The unrelated Gemini workspace-trust failure is tracked as shared workflow infrastructure evidence.
Remove deprecated Gemini GitHub Actions automation; no runtime or deployment changes.
Promote the validated .NET 10/PostgreSQL/Scalar service line, pin public Aspire and MessagingContracts source dependencies, and make CI validation-only. No production deployment or database mutation.
@natthapolvanasrivilai
natthapolvanasrivilai requested a review from a team as a code owner July 19, 2026 13:07
@natthapolvanasrivilai
natthapolvanasrivilai merged commit 253a172 into develop Jul 19, 2026
2 checks passed
@natthapolvanasrivilai
natthapolvanasrivilai deleted the codex/countryservice-convergence branch July 19, 2026 13:11
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.

1 participant