Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Github action fixes and mobile_build script cleanup #3073

Merged

Conversation

StriderDM
Copy link
Contributor

@StriderDM StriderDM commented Jul 9, 2021

Description

Restored ${PKG_PATH} variable for iOS
Restored universal directory for iOS
Resolved warnings in mobile_build.sh
Made libsqlite3-sys an optional dependency and filtered it out in wallet_ffi for android

Merge #3072 first since this PR is built on top of it.

Motivation and Context

Necessary for the build script to work correctly as well as the github action

How Has This Been Tested?

Docker locally.

Checklist:

  • I'm merging against the development branch.
  • I have squashed my commits into a single commit.

@StriderDM StriderDM force-pushed the mobile_build_script_fixes branch from 51e8970 to e677203 Compare July 9, 2021 09:16
Restored ${PKG_PATH} variable
Restored universal directory for iOS
Resolved warnings in mobile_build.sh

Make libsqlite3-sys an optional dependency
@StriderDM StriderDM force-pushed the mobile_build_script_fixes branch from e677203 to 17a60e4 Compare July 9, 2021 13:57
Copy link
Collaborator

@stringhandler stringhandler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@stringhandler stringhandler merged commit def5de6 into tari-project:development Jul 14, 2021
aviator-app bot pushed a commit that referenced this pull request Sep 22, 2021
Description
---
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 which is done in mobile_build.sh.

Merge #3285 first.

We had to do the same for sqlite here:
#3073

Motivation and Context
---
Current:
![Screen Shot 2021-09-06 at 6 30 17 PM](https://user-images.githubusercontent.com/51991544/132251475-cce3d7e4-7237-4c70-8f40-c92b12d0091a.png)

This PR:
![Screen Shot 2021-09-06 at 8 06 48 PM](https://user-images.githubusercontent.com/51991544/132251455-bbdfbc5c-864f-416a-953f-9f8f6504666b.png)


[mobile_build_logs.zip](https://github.com/tari-project/tari/files/7104686/mobile_build_logs.zip)

How Has This Been Tested?
---
cargo test --all --all-features
nvm use v12.22.6 && ./node_modules/.bin/cucumber-js features/WalletFFI.feature
sh  mobile_build.sh
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants