Skip to content

Consolidated engine #190: 7 source PRs • 1262 Windows tests green (DRAFT) - #190

Merged
masarray merged 221 commits into
stagingfrom
integration/20261022-iec61850-clean-consolidation
Oct 22, 2026
Merged

masarray merged 221 commits into
stagingfrom
integration/20261022-iec61850-clean-consolidation

Conversation

@masarray

@masarray masarray commented Oct 22, 2026 •

Copy link
Copy Markdown
Owner

Controlled ARIEC61850 consolidation — integration candidate, NOT release

This is the single reviewed consolidation lane for repository audit issue #144. Do not merge merely because the tree is conflict-free or CI green. Preserve ARSAS FAT evidence and immutable engine lock.

Pinned source commits / ancestry

Why this composition is safe to test, not yet to ship

For each of the 10 source/test paths from the three siblings, compared exact Git blob IDs at its original merge-base to #189: all unchanged on #189 (zero overlapping modifications). Installed sibling file blobs verbatim into #189's base tree. Original eleven-path integration plus two COMTRADE RIO source/test paths (#170); the CI infrastructure workflow has since been squash-merged independently as #191, and this branch now adopts the exact same workflow blob:

  • pull_request on any target branch;
  • read-only actions/checkout at event SHA, default PR synthetic merge commit, not GITHUB_HEAD_REF/branch checkout;
  • existing full Windows source check, restore, Release build, engine tests, NuGet test artifact and logs retained.

Mandatory qualification gates before main merge

Provenance and public API boundaries

No raw customer SCL/captures or private diagnostics added. No engine pin change. main now contains workflow-only infrastructure squash PR #191 at 3d21238d0b62f24faecd5948a4ee238c82b35966; engine source remains at the original mainline baseline. PR is draft intentionally; reviewer should confirm post-merge test and readiness before production.

2026-10-22 consolidation increment — #130 SV + #138 typed semantics

Current integration SHA: 14b19d30466fd296ad1e6d0bddcdd574992bc464, fast-forwarded from 5077d6ac1e8394ec789f90b3b33cad3260ab0241 (no rewrite). Additional preserved source parents:

All original functional changes from #189/#186/#187/#182/#170 remain ancestry. Prior green 1,231/1,231 CI on 5077d6ac does not qualify this new SHA; require a new green exact merged-tree CI. The new SV engine analysis is not itself proof of physical SMV/relay behavior. Remaining divergent #137/#160/#155/#175/old P0–P6 stack and #171 dependency updates have not been silently imported. Engine release and ARSAS lock updates are explicitly blocked pending separate acceptance.

Exact post-consolidation Windows gate — PASS

  • Head 14b19d30466fd296ad1e6d0bddcdd574992bc464 checked out as PR Consolidated engine #190: 7 source PRs • 1262 Windows tests green (DRAFT) #190 synthetic merge 49ae033 against main 3d21238d0b62f24faecd5948a4ee238c82b35966.
  • CI run #39778971482: SUCCESS, source/provenance, restore, Release build, 1,262/1,262 tests passed, 0 warnings/0 build errors, test build package and diagnostic artifacts uploaded.
  • Supersedes the previous 1,231-test CI for commit 5077d6ac. Physical FAT, ARSAS combined immutable-lock build and remaining divergent feature reconciliation not satisfied by software gate. Keep PR DRAFT and main engine source unchanged.

#170 source and regression-test blobs are copied verbatim after confirming their original merge-base blobs match the engine #190 integration tree. Include main infrastructure PR #191 as explicit parent and use its identical checked workflow blob; avoid future conflicts. No ARSAS repin, no main engine source merge, no field qualification. This candidate needs fresh Windows synthetic-merge CI.
@masarray masarray changed the title Integration audit: preserve #189/#186/#187/#182; merge-aware CI (DRAFT, NOT RELEASE) Integration audit: preserve #189/#186/#187/#182/#170; CI-qualified candidate (DRAFT) Oct 22, 2026
@masarray masarray changed the title Integration audit: preserve #189/#186/#187/#182/#170; CI-qualified candidate (DRAFT) Integration audit: #189/#186/#187/#182/#170 (DRAFT — combined CI gate) Oct 22, 2026
@masarray masarray changed the title Integration audit: #189/#186/#187/#182/#170 (DRAFT — combined CI gate) Integration audit: #189/#186/#187/#182/#170 (DRAFT — 1231 CI tests green) Oct 22, 2026
…CL semantics #138

Consolidate exact #130 12 new SV analysis/docs/tests blobs and #138 four proven non-overlapping discovery/SCL source and test blobs; Iec61850StandardModelRegistry.cs already byte-identical to #138. Explicit parents preserve source ancestry. No updates to main or ARSAS engine lock, no release/FAT qualification. Validate exact merged candidate via Windows CI.
@masarray masarray changed the title Integration audit: #189/#186/#187/#182/#170 (DRAFT — 1231 CI tests green) Integration audit: preserve #189/#186/#187/#182/#170/#130/#138 (DRAFT, retest) Oct 22, 2026
@masarray masarray changed the title Integration audit: preserve #189/#186/#187/#182/#170/#130/#138 (DRAFT, retest) Consolidated engine #190: 7 source PRs • 1262 Windows tests green (DRAFT) Oct 22, 2026
This was referenced Oct 22, 2026
@masarray
masarray changed the base branch from main to staging October 22, 2026 12:51

Copy link
Copy Markdown
Owner Author

Staging-only acceptance, 2026-10-22. Branch staging was created from main SHA 3d21238d0b62f24faecd5948a4ee238c82b35966. This exact candidate HEAD 14b19d30466fd296ad1e6d0bddcdd574992bc464 passed synthetic-merge CI #39778971482 (1,262/1,262, zero build warning/error). Because staging and tested main base have identical commits, it is eligible for staging integration only. No production/main release approval, ARSAS engine pin change, physical FAT or control field qualification is implied. The subsequent staging -> main PR MUST remain DRAFT until independent review and combined qualification. All original source PRs are preserved in ancestry.

@masarray
masarray marked this pull request as ready for review October 22, 2026 12:52
@masarray
masarray merged commit b3688be into staging Oct 22, 2026
1 check passed
@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-22T12:53:53.848617Z 14b19d3 Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

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