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.

Sign up for GitHub

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

Jump to bottom

fix(ci): wallet ffi build fix #4993

Merged
merged 12 commits into from
Dec 6, 2022
Merged

fix(ci): wallet ffi build fix #4993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ab21159
Fix client path
leet4tari Oct 3, 2022
695da07
Merge branch 'development' of github.com:tari-project/tari into devel…
leet4tari Oct 25, 2022
1001e22
Add dependabot
leet4tari Oct 31, 2022
1e05768
Merge branch 'development' of github.com:tari-project/tari into devel…
leet4tari Oct 31, 2022
db34b36
Merge branch 'development' of github.com:tari-project/tari into devel…
leet4tari Nov 7, 2022
359a4ac
Merge remote-tracking branch 'upstream/development' into development
leet4tari Nov 9, 2022
5b1e0de
Merge branch 'development' of github.com:tari-project/tari into devel…
leet4tari Nov 16, 2022
f944262
Single build per branch and fix git branch/tag name
leet4tari Nov 16, 2022
c64b7d1
MC fix
leet4tari Dec 2, 2022
344dc85
Fix wallet ffi build for android
leet4tari Dec 2, 2022
cb79dbf
Change git2/ssh as optional
leet4tari Dec 5, 2022
2ab4226
Forgot Cargo.lock
leet4tari Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 47 additions & 81 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ anyhow = "1.0.53"
config = { version = "0.13.0", default_features = false, features = ["toml"] }
derivative = "2.2.0"
dirs-next = "1.0.2"
git2 = { version = "0.8", optional = true }
git2 = { version = "0.8", default_features = false, optional = true }
log = "0.4.8"
log4rs = { version = "1.2.0", default_features = false, features = ["config_parsing", "threshold_filter", "yaml_format"] }
multiaddr = { version = "0.14.0" }
Expand Down