feat: Bundle sqlite dependency (#3036)

tari-project · Jul 7, 2021 · 7bd1341 · 7bd1341
2 parents e33880b + 35ca97b
commit 7bd1341
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,11 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [
-          #ubuntu-18.04,
-          macos-10.15,
-          windows-2019
-          ]
+        os: [ubuntu-20.04, macos-10.15, windows-2019]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout
@@ -29,7 +25,6 @@ jobs:
             openssl \
             libssl-dev \
             pkg-config \
-            libsqlite3-dev \
             git \
             cmake \
             zip \

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml
@@ -24,10 +24,11 @@ chrono = { version = "0.4.6", features = ["serde"]}
 crossbeam-channel = "0.3.8"
 digest = "0.9.0"
 diesel_migrations =  "1.4"
-diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono"]}
+diesel = {version="1.4.7", features = ["sqlite", "serde_json", "chrono"]}
 fs2 = "0.3.0"
 futures =  { version = "^0.3.1", features =["compat", "std"]}
 lazy_static = "1.4.0"
+libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = ["bundled"] }
 log = "0.4.6"
 log4rs = {version = "0.8.3", features = ["console_appender", "file_appender", "file", "yaml_format"]}
 lmdb-zero = "0.4.4"

diff --git a/comms/dht/Cargo.toml b/comms/dht/Cargo.toml
@@ -22,10 +22,11 @@ bitflags = "1.2.0"
 bytes = "0.4.12"
 chacha20 = "0.7.1"
 chrono = "0.4.9"
-diesel = {version="1.4", features = ["sqlite", "serde_json", "chrono", "numeric"]}
+diesel = {version="1.4.7", features = ["sqlite", "serde_json", "chrono", "numeric"]}
 diesel_migrations =  "1.4"
 digest = "0.9.0"
 futures= {version= "^0.3.1"}
+libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = ["bundled"] }
 log = "0.4.8"
 prost = "=0.6.1"
 prost-types = "=0.6.1"