Skip to content

Commit

Permalink
fix: resolved feature flags for openssl vendoring
Browse files Browse the repository at this point in the history
Include vendored openssl library when not building ffi wallet library.
Exclude vendored openssl library when building ffi wallet library as it needs to be cross compiled for mobile.
Restored packages to ci.yml.

(cherry picked from commit 364e4b1)
  • Loading branch information
StriderDM committed Sep 3, 2021
1 parent d785f4f commit 4232814
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get -y install \
openssl \
libssl-dev \
libsqlite3-dev \
pkg-config \
git \
cmake \
Expand Down Expand Up @@ -110,7 +112,9 @@ jobs:
run: |
sudo apt-get update && \
sudo apt-get -y install \
openssl \
libssl-dev \
libsqlite3-dev \
pkg-config \
git \
cmake \
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion base_layer/wallet_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ version = "0.17.5"
edition = "2018"

[dependencies]
tari_comms = { version = "^0.9", path = "../../comms", default-features = false}
tari_comms = { version = "^0.9", path = "../../comms", features = ["c_integration"]}
tari_comms_dht = { version = "^0.9", path = "../../comms/dht", default-features = false }
tari_common_types = {path="../common_types"}
tari_crypto = "0.11.1"
Expand Down
3 changes: 2 additions & 1 deletion comms/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ lmdb-zero = "0.4.4"
log = { version = "0.4.0", features = ["std"] }
multiaddr = { version = "0.13.0" }
nom = { version = "5.1.0", features = ["std"], default-features = false }
openssl = { version = "0.10", features = ["vendored"] }
openssl-sys = { version = "0.9.66", features = ["vendored"], optional = true }
pin-project = "1.0.8"
prost = "=0.8.0"
rand = "0.8"
Expand Down Expand Up @@ -66,5 +66,6 @@ tempfile = "3.1.0"
tari_common = { version = "^0.9", path = "../common", features = ["build"] }

[features]
c_integration = []
avx2 = ["tari_crypto/avx2"]
rpc = ["tower-make"]
2 changes: 1 addition & 1 deletion integration_tests/features/support/world.js
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ class CustomWorld {

setWorldConstructor(CustomWorld);

BeforeAll({ timeout: 1200000 }, async function () {
BeforeAll({ timeout: 2400000 }, async function () {
const baseNode = new BaseNodeProcess("compile");
console.log("Compiling base node...");
await baseNode.init();
Expand Down

0 comments on commit 4232814

Please sign in to comment.