Merge the latest @journeyapps/sqlcipher:master into our fork #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Visual studio build fixes
Upgrade node-pre-gyp to version 0.9.0
Conflicts: .travis.yml appveyor.yml
makes individual builds testing easier for now
* Update packages. * Sqlite 3.31.0 / SQLCipher 4.3.0. * Update for electron major versions 6, 7 and 8 * Update circleci build steps * Delete .travis.yml * Update resource_class for circleci * Fix circleci config * Don't build failing macos-8.16.0 build * Remove older electron builds that are failing * v4.1.0 * [publish binary] Co-authored-by: Ralf Kistner <ralf@journeyapps.com>
Change-Id: I79000463955d16eec8809c870f7d02c60da53432 Bug: TryGhost/node-sqlite3#418 Relate-to: TryGhost/node-sqlite3#1028 Origin: https://github.com/tizenteam/node-sqlite3 Signed-off-by: Philippe Coval <rzr@users.sf.net>
- This updates the README to be inline with what's in master
* Ensure JavaScript exceptions bubble up * Fix segfault * Fix mutex segfault * Fix segfault caused by memory leak If the database was being closed, and non-exclusive work was scheduled, it overrode the lock flag such that the state became open=false locked=false instead of open=false locked=true. This caused queued work to not be processed, leaking memory, which causes a segfault during napi cleanup. Make the same changes to other methods for safe measure.
* release: 5.0.1 * release: update log
Update with upstream mapbox/node-sqlcipher3
* Test with CircleCI for Windows. * Multiple windows architectures. * Fix. * Fix node path. * Fix issue. * Final config. * Use latest orb.
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.15...4.17.20) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Add notes on electron-forge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I ran
git merge upstream/masterand resolved changes (whereupstreamis the "real"@journeyapps/sqlcipher). It may be more useful to see how this branch is different fromupstream/masterthan the diff below. I've putgit diff upstream/masterinto this Gist.