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

bug: remove ubuntu target for grpcio #775

Merged
merged 2 commits into from
Aug 10, 2020
Merged

bug: remove ubuntu target for grpcio #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a29ab5d
bug: remove ubuntu target for grpcio
jrconlin Aug 10, 2020
4478280
Merge branch 'master' of github.com:mozilla-services/syncstorage-rs i…
jrconlin Aug 10, 2020
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
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ env_logger = "0.7.1"
failure = "0.1.8"
futures = { version = "0.3", features = ["compat"] }
googleapis-raw = { version = "0", path = "vendor/mozilla-rust-sdk/googleapis-raw" }
# Some versions of OpenSSL 1.1.1 conflict with grpcio's built-in boringssl which can cause
# syncserver to either fail to either compile, or start. In those cases, try
# `cargo build --features grpcio/openssl ...`
grpcio = { version = "0.6.0" }
lazy_static = "1.4.0"
hawk = "3.2"
Expand Down Expand Up @@ -68,9 +71,6 @@ validator = "0.10"
validator_derive = "0.10"
woothee = "0.11"

[target.'cfg(target_vendor="ubuntu")'.dependencies]
grpcio = { version="0.6", features=["openssl"] }

[dev-dependencies]
tokio = { version = "0.2", features = ["macros"] }

Expand Down
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ This requires access to the mozilla-rust-sdk which is now available at `/vendor/

### Connecting to Firefox

This will walk you through the steps to connect this project to your local copy of Firefox.
This will walk you through the steps to connect this project to your local copy of Firefox.

1. Follow the steps outlined above for running this project using [MySQL](https://github.com/mozilla-services/syncstorage-rs#mysql).

Expand Down Expand Up @@ -201,11 +201,13 @@ Open a PR after doing the following:

Once your PR merges, then go ahead and create an official [GitHub release](https://github.com/mozilla-services/syncstorage-rs/releases).


## Troubleshooting

- `rm Cargo.lock; cargo clean;` - Try this if you're having problems compiling.

- Some versions of OpenSSL 1.1.1 can conflict with grpcio's built in BoringSSL. These errors can cause syncstorage to fail to run or compile.
If you see a problem related to `libssl` you may need to specify the `cargo` option `--features grpcio/openssl` to force grpcio to use OpenSSL.

## Related Documentation

- [API docs](https://mozilla-services.readthedocs.io/en/latest/storage/apis-1.5.html)
Expand Down