Skip to content

chore(sync): merge beta into alpha - #526

Merged
jondricek merged 3 commits into
alphafrom
beta
Nov 19, 2026
Merged

jondricek merged 3 commits into
alphafrom
beta

Conversation

@jondricek

@jondricek jondricek commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Summary

Synchronize existing beta into alpha after #525 merged with source ancestry preserved.

- @mitre-attack/attack-data-model: ^4.11.7 (locked 4.11.7)
+ @mitre-attack/attack-data-model: ^4.12.0 (locked 4.12.0)
  • Source beta: aa8a6ebf9643318af43c510741950dea1fa300c0
  • Destination alpha: 5058096f7dad2cb015fa34539b85c527d76d1361
  • Prospective merge tree: 594c9887e0fe457d5461f40abab7d1bdb105a1e5
  • Three commits absent by ancestry: dependency update, empty release trigger, and merge of chore(sync): merge next into beta #525. git cherry lists two unmatched non-merge entries, but the release trigger is empty; these represent one dependency change, not three independent features. No patch-equivalent or squash ambiguity identified. Resulting merge is conflict-free, changing only package.json and package-lock.json (+5/-5); alpha-specific behavior remains in the merged tree.
  • main → next and next → beta are synchronized by ancestry. No other synchronization PR remains open.

Evidence

  • Before: alpha resolves ADM 4.11.7; beta resolves ADM 4.12.0.
    After: isolated merge resolves ADM 4.12.0 with the two-file diff above.
  • Simulated git merge --no-commit --no-ff beta on alpha in an isolated temporary worktree. No release branch pushes, local source edits, or developer-checkout changes.
  • Node 22.22.3; npm ci, lint, lockfile check, commitlint for all three incoming commits, and staged whitespace check pass.
  • Focused tests, run separately before the full suite: allowed-values 16, validation-bypasses 18, ADM middleware 20 passing.
  • Dependency integrity: 1093 registry signatures and 145 attestations verified.
  • NOT VALIDATED — draft: full npm test passed OpenAPI 4 and configuration 22; API finished with 1284 passing / 1 failing. Legacy reviewed state on release-track admission → rejects an incomplete staged batch without reviewing its valid companion timed out after 20000ms in app/tests/api/release-tracks/reviewed-state.spec.js. Middleware and scheduler were short-circuited by that failure. The entire reviewed-state file passes in isolation (17 tests); separately run middleware (29) and scheduler (15) suites also pass. The timeout cause is unconfirmed, and isolation success does not establish a full-suite pass. No tests changed, skipped, or weakened. Keep this PR draft until the full required checks pass on current tips.

Merge Danger

Door: two-way

The dependency update can be reverted; runtime validation and allowed-value choices follow the installed ADM schemas. No migration, endpoint contract, or additional behavior is introduced by this synchronization beyond the existing source change.

Blast Radius: validation

Merge using a merge commit or ancestry-preserving fast-forward. Do not squash or rebase: propagation relies on preserving source ancestry.

Proposed merge message:

chore(sync): merge beta into alpha

Propagate the ATT&CK Data Model 4.12.0 update while preserving release ancestry.

@jondricek

Copy link
Copy Markdown
Contributor Author

Validation failure — not validated / keep draft

Validated the clean simulated merge of source beta aa8a6ebf9643318af43c510741950dea1fa300c0 into destination alpha 5058096f7dad2cb015fa34539b85c527d76d1361 (tree 594c9887e0fe457d5461f40abab7d1bdb105a1e5). Both tips were re-fetched unchanged before publishing.

npm test exited 1: OpenAPI 4 pass, configuration 22 pass, API 1284 pass / 1 fail. Failure:

Legacy reviewed state on release-track admission
  rejects an incomplete staged batch without reviewing its valid companion
Error: Timeout of 20000ms exceeded
app/tests/api/release-tracks/reviewed-state.spec.js

The whole failing file passes in isolation using npm run test:file -- app/tests/api/release-tracks/reviewed-state.spec.js: 17 passing. Since npm short-circuited, ran the remaining suites separately: middleware 29 passing, scheduler 15 passing. The cause is unconfirmed; these isolation results do not validate the full combined suite. No source/test changes, skipped tests, or weakened assertions.

Focused allowed-values 16, validation-bypasses 18, ADM middleware 20 pass. Installation, lint, lockfile, incoming-commit lint, whitespace and dependency integrity checks pass (1093 signatures, 145 attestations).

Required next gate: full npm test and other required checks must pass on current release tips before marking ready. Preserve source ancestry with a merge commit or fast-forward; no squash/rebase. No resolution branch is needed for this clean merge. Labels codex and codex-automation are unavailable in this repository.

@codecov-commenter

Copy link
Copy Markdown

⚠️ Please install the 'codecov app svg image' to ensure uploads and comments are reliably processed by Codecov.

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 84.36%. Comparing base (e8b4700) to head (aa8a6eb).
⚠️ Report is 5 commits behind head on alpha.
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##            alpha     #526   +/-   ##
=======================================
  Coverage   84.36%   84.36%           
=======================================
  Files         278      278           
  Lines       44189    44189           
  Branches     6822     6825    +3     
=======================================
+ Hits        37278    37281    +3     
+ Misses       6809     6806    -3     
  Partials      102      102           

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 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.

@jondricek
jondricek marked this pull request as ready for review November 19, 2026 18:45
@jondricek
jondricek merged commit 6bfec43 into alpha Nov 19, 2026
8 checks passed
@jondricek

Copy link
Copy Markdown
Contributor Author

Validation passed; synchronization completed

PR merge CI run 44586288672 passed commitlint, static checks and regression tests. Checkout logs confirm simulated merge b049103c combines source beta aa8a6ebf9643318af43c510741950dea1fa300c0 with alpha 5058096f7dad2cb015fa34539b85c527d76d1361, rather than testing only the source branch. coverage:cobertura ran the full npm test: OpenAPI 4, configuration 22, API 1285, middleware 29 and scheduler 15 passing. This supersedes the prior full-suite validation blocker; the earlier local timeout's cause remains unconfirmed.

PR #526 merged at 2026-11-19T18:45:27Z as 6bfec43d472c0db37c2ebfe5dc9122b7d287e467, with both original alpha and beta tips as parents, preserving source ancestry. Fresh isolated fetch and final remote recheck confirm main → next → beta → alpha now has zero absent source commits, empty patch-equivalence output and empty resulting merge diffs for every adjacent pair. No ambiguity or outstanding synchronization PR remains. No release branches were pushed or PRs merged by this automation.

@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 4.27.0-alpha.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants