diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 236d612451..003a327558 100644 --- 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 index 69b5e7ec33..c40697827f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2108,6 +2108,7 @@ version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290b64917f8b0cb885d9de0f9959fe1f775d7fa12f1da2db9001c1c8ab60f89d" dependencies = [ + "cc", "pkg-config", "vcpkg", ] @@ -4324,6 +4325,7 @@ dependencies = [ "futures-test-preview", "futures-util", "lazy_static 1.4.0", + "libsqlite3-sys", "lmdb-zero", "log 0.4.14", "petgraph", @@ -4714,6 +4716,7 @@ dependencies = [ "fs2", "futures 0.3.15", "lazy_static 1.4.0", + "libsqlite3-sys", "lmdb-zero", "log 0.4.14", "log4rs", diff --git a/base_layer/wallet/Cargo.toml b/base_layer/wallet/Cargo.toml index f216999d9b..d0472a44d3 100644 --- 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 index 20380ea4d1..9c9b9e6efa 100644 --- 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"