Skip to content

chore(sync): merge main into next - #518

Open
jondricek wants to merge 3 commits into
nextfrom
sync/main-to-next-20261016
Open

jondricek wants to merge 3 commits into
nextfrom
sync/main-to-next-20261016

Conversation

@jondricek

Copy link
Copy Markdown
Contributor

Summary

main → sync/main-to-next-20261016 → next

Propagate the ICS analytic platform correction from main. The merge changes only app/config/allowed-values.json: ICS analytic platforms become Windows, Linux, Network, Embedded, IaaS, SaaS, and None. Two source commits are absent by ancestry (the fix and its merge); its non-merge patch is not equivalent to a destination patch.

  • Source main: 6e6bf5116fcc21eab4962ec1ffa4f9f130744d58
  • Destination next: 32f2ca1629d355a74b2f4472176d94b137110afe
  • Dedicated branch starts at destination and merges source with a merge commit.
  • Dependent next → beta synchronization waits until this PR merges, then fetches and reassesses.

Evidence

  • Before: Source tip is not an ancestor of destination.
    After: Both recorded tips are ancestors of the prepared merge; merge is conflict-free.
  • Node 22; npm ci, commitlint, lint, dependency signatures (1,093 packages), and full npm test pass: 2 OpenAPI + 22 config + 1,172 API + 29 middleware + 15 scheduler tests.
  • Initial coverage run reached a ten-minute wrapper timeout and logged two intermittent API failures (404 and socket hang-up). Both affected spec files passed in isolation, and the subsequent complete npm test run passed (1,240 tests).

Merge Danger

Door: two-way

Blast Radius: configuration

Merge with a merge commit (or an ancestry-preserving fast-forward). Do not squash or rebase: this synchronization must preserve source ancestry. No release branch is pushed directly.

@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 82.25%. Comparing base (32f2ca1) to head (c60cca4).
❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@           Coverage Diff           @@
##             next     #518   +/-   ##
=======================================
  Coverage   82.25%   82.25%           
=======================================
  Files         258      258           
  Lines       41833    41833           
  Branches     5608     5608           
=======================================
  Hits        34410    34410           
  Misses       7316     7316           
  Partials      107      107           

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

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.

4 participants