chore: bundle sqlite by default for tests #3382
Conversation
|
LGTM just waiting on CI |
| @@ -392,7 +392,7 @@ EOF | |||
| if [ "${MACHINE}" == "Mac" ]; then | |||
| if [ "${MAC_MAIN_VERSION}" -le 10 ]; then | |||
| if [ "${MAC_SUB_VERSION}" -ge 15 ]; then | |||
| cargo build --lib --release > "${ANDROID_LOG_PATH}/cargo_${PLATFORMABI}_${LEVEL}.txt" 2>&1 | |||
| cargo build --lib --release --no-default-features > "${ANDROID_LOG_PATH}/cargo_${PLATFORMABI}_${LEVEL}.txt" 2>&1 | |||
| else | |||
| cargo ndk --target ${PLATFORMABI} --android-platform ${LEVEL} -- build --release > "${ANDROID_LOG_PATH}/cargo_${PLATFORMABI}_${LEVEL}.txt" 2>&1 | |||
There was a problem hiding this comment.
Are we only keeping support for the latest macOS? If not, this will need to be updated as well.
There was a problem hiding this comment.
didn't realise there were so many logic branches here
stringhandler
dismissed stale reviews from philipr-za and delta1
via
1bc4301
|
Looks like it could work, although I think we should do this before merging this in: Cargo test in this case is unfortunately not enough to tell if this will work on the intended devices, the above will. |
|
There is also an alternative to this since the purpose of it is purely for tests. Since the libraries are not being static linked in to the wallet_ffi library by building with cargo, having the dependencies installed beforehand and in the path will be sufficient for the tests to run for wallet_ffi. Just another option. |
revert bundle sqlite by default for tests (tari-project#3382) workaround for linker error for iOS framework added dynamically linked dependencies to ci.yml for wallet_ffi tests
This reverts commit dbe023c.
This reverts commit dbe023c.
This reverts commit dbe023c.
This reverts commit dbe023c.
Description
Yet another attempt at bundling openssl and sqlite for easy debugging/testing on Windows
Motivation and Context
The current feature setup means that you cannot run
cargo testin thewallet_ffior any specific folder other than the root. I tried to follow the same way that other crates do this, but allowing a user to optionally specify whether a dependency is bundled or not, and not bundle it by default, but this makes running individual tests difficult.Since tests are run regularly, I made the default on wallet_ffi include the bundles, but then added
--no-default-featuresto the mobile buildsHow Has This Been Tested?
Cargo test