Skip to content

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

Merged
jondricek merged 7 commits into
nextfrom
sync/main-to-next-20261016
Oct 22, 2026
Merged

jondricek merged 7 commits into
nextfrom
sync/main-to-next-20261016

Conversation

@jondricek

@jondricek jondricek commented Oct 16, 2026 •

Copy link
Copy Markdown
Contributor

Summary

main (98c75d17) → sync/main-to-next-20261016 → next (32f2ca16)

Merge the ICS analytic platform defaults from main: Windows, Linux, Network Devices, Embedded, and None. The final diff changes only app/config/allowed-values.json and preserves source ancestry through merge commits.

  • Source main: 98c75d1788c4d3e14600041a25eb02e696055822
  • Destination next: 32f2ca1629d355a74b2f4472176d94b137110afe
  • Three source commits absent by ancestry; two non-merge patches unmatched by patch equivalence.
  • Downstream next → beta synchronization waits for this PR to merge, then fetches and reassesses.

Evidence

  • Before: Head 1865287c included a five-line allowed-values test fixture adjustment and passed full CI.
  • After: Commit 51dc3657 removes that adjustment at the user's explicit request. app/tests/api/system-configuration/allowed-values.spec.js matches destination next exactly; git diff --check passes.
  • Tests were not rerun for this exact restoration. The existing add/toggle/remove test is expected to fail because it assumes Network Devices is absent from analytic defaults. The user accepts this and wants test repairs made on next separately. Prior green CI applies to the previous head, not this restored version.

Merge Danger

Door: two-way

Blast Radius: configuration

Known expected regression-test failure described above. Use a merge commit or ancestry-preserving fast-forward; do not squash or rebase this synchronization PR.

@codecov-commenter

codecov-commenter commented Oct 16, 2026 •

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 (1865287).
❗ 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.

jondricek and others added 4 commits October 19, 2026 13:21
Remove the sync-specific fixture adjustment from PR #518 as requested. Leave test repairs for next; the seeded Network Devices assertion is expected to fail until addressed there.
@jondricek
jondricek merged commit bc9a20e into next Oct 22, 2026
3 of 4 checks passed
@jondricek
jondricek deleted the sync/main-to-next-20261016 branch October 22, 2026 13:56
jondricek added a commit that referenced this pull request Oct 22, 2026
Remove the sync-specific fixture adjustment from PR #518 as requested.
Leave test repairs for next; the seeded Network Devices assertion is
expected to fail until addressed there.
jondricek added a commit that referenced this pull request Oct 22, 2026
@github-actions

Copy link
Copy Markdown

🎉 This PR is included in version 4.25.1 🎉

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.

4 participants