0
0
mirror of https://github.com/signalapp/libsignal.git synced 2024-09-20 12:02:18 +02:00

Merge pull request #12 from signalapp/jrose/public-dependency

Switch to the public libsignal-protocol-rust for libsignal-ffi
This commit is contained in:
Jordan Rose 2020-10-14 11:37:05 -07:00 committed by GitHub
commit b3f500b639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 19 deletions

View File

@ -18,17 +18,12 @@ jobs:
- name: Check out libsignal-ffi
uses: actions/checkout@v2
with:
path: libsignal-ffi
- name: Check out libsignal-protocol-rust
uses: actions/checkout@v2
with:
repository: signalapp/libsignal-protocol-rust
path: libsignal-protocol-rust
- name: Configure git to use HTTPS
run: git config --global url."https://github.com".insteadOf ssh://git@github.com
- name: Build libsignal-ffi
run: make -C libsignal-ffi
run: make
# TODO: In the future, we should also run tests for our clients,
# to make sure a change doesn't break them (at least not unexpectedly).
@ -42,19 +37,12 @@ jobs:
steps:
- name: Check out libsignal-ffi
uses: actions/checkout@v2
with:
path: libsignal-ffi
- name: Check out libsignal-protocol-rust
uses: actions/checkout@v2
with:
repository: signalapp/libsignal-protocol-rust
path: libsignal-protocol-rust
- name: Configure git to use HTTPS
run: git config --global url."https://github.com".insteadOf ssh://git@github.com
- name: Rustfmt check
run: cargo fmt -- --check
working-directory: libsignal-ffi
- name: Clippy
run: cargo clippy
working-directory: libsignal-ffi

View File

@ -9,8 +9,7 @@ name = "signal_ffi"
crate-type = ["dylib"]
[dependencies]
libsignal-protocol-rust = { path = "../libsignal-protocol-rust" }
#libsignal-protocol-rust = { git = "ssh://git@github.com/signalapp/libsignal-protocol-rust.git" }
libsignal-protocol-rust = { git = "ssh://git@github.com/signalapp/libsignal-protocol-rust.git" }
rand = "0.7.3"
libc = "0.2"
num-traits = "0.2"