Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: jsonMerge with complex json literals #431

Merged
merged 2 commits into from
Jan 10, 2025
Merged

Conversation

cyjake
Copy link
Owner

@cyjake cyjake commented Jan 9, 2025

att

Copy link
Contributor

@fengmk2 fengmk2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

@cyjake cyjake force-pushed the fix-json-merge-escape branch from 14bff78 to b1d1318 Compare January 9, 2025 15:16
@cyjake cyjake force-pushed the fix-json-merge-escape branch from b1d1318 to e58b4a6 Compare January 9, 2025 15:31
"sqlite3": {
"glob": "11.0.0",
"node-gyp": "10.2.0"
}
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if [ "$file" != test/integration/sqlcipher.test.js ]; then
run ${file};
fi
done
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ubuntu 22 升级到了 openssl 3,sqlcipher 编译用的还是 1.1,降级起来有点麻烦,先从默认的 CI 任务里面摘出来,必要的时候手动跑

Copy link

codecov bot commented Jan 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.79%. Comparing base (2e31e11) to head (e58b4a6).
Report is 3 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #431      +/-   ##
==========================================
+ Coverage   96.78%   96.79%   +0.01%     
==========================================
  Files          45       45              
  Lines        3700     3716      +16     
  Branches       72       72              
==========================================
+ Hits         3581     3597      +16     
  Misses        105      105              
  Partials       14       14              

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

@cyjake cyjake requested a review from fengmk2 January 10, 2025 01:56
@cyjake cyjake merged commit 586442d into master Jan 10, 2025
6 checks passed
@cyjake cyjake deleted the fix-json-merge-escape branch January 10, 2025 02:02
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.

3 participants