Skip to content

Commit

Permalink
Merge #313
Browse files Browse the repository at this point in the history
313: Fix build for examples r=Pagten a=AdrianCX

Versions must be in sync for examples and em-app.

todo: add the examples to bors

Co-authored-by: Adrian Cruceru <[email protected]>
  • Loading branch information
bors[bot] and Adrian Cruceru authored Jan 22, 2021
2 parents 655d5b5 + 7bbe210 commit b70745b
Show file tree
Hide file tree
Showing 6 changed files with 173 additions and 91 deletions.
46 changes: 36 additions & 10 deletions em-app/examples/client/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 em-app/examples/client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ license = "MPL-2.0"

[dependencies]
em-app = { path = "../../" }
mbedtls = {version="0.5", default-features = false, features = ["sgx"]}
mbedtls = { version = "0.7", default-features = false, features = ["sgx"] }
serde_json = "1.0"
pkix = { git = "https://github.com/fortanix/pkix.git" }
Loading

0 comments on commit b70745b

Please sign in to comment.