Skip to content

Commit b1b798c

Browse files
Merge branch 'master' into feature/subscription-comparison-table
2 parents 812e1ac + 0e6a934 commit b1b798c

20 files changed

Lines changed: 1305 additions & 113 deletions

‎.github/workflows/test-meshery-integration.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,14 @@ jobs:
5151
uses: actions/checkout@v6
5252
with:
5353
repository: meshery/meshery
54-
# Pin to last known-good commit before the @mui/x-tree-view v8 upgrade
55-
# that broke the TreeView import (meshery/meshery#18163).
56-
# Remove this pin once meshery/meshery#18167 is merged.
57-
ref: 7c3d02c91365dc776b11ffc50aab277026e86701
54+
# Pin to the commit that added date-fns as a Meshery UI dependency
55+
# (meshery/meshery#20416), needed because Sistent's UniversalFilter
56+
# date-range picker now transitively requires @mui/x-date-pickers'
57+
# AdapterDateFns, which Sistent externalizes rather than bundles.
58+
# The prior pin (before the @mui/x-tree-view v8 upgrade that broke
59+
# the TreeView import, meshery/meshery#18163) is no longer needed
60+
# since meshery/meshery#18167 merged.
61+
ref: 2d988df92ad5d336230ed9255d08a85d6bebe8fd
5862
path: meshery
5963
fetch-depth: 1
6064

0 commit comments

Comments
 (0)