Skip to content

Commit

Permalink
fix(upstream): point to upstream master, not feature branch
Browse files Browse the repository at this point in the history
  • Loading branch information
laser committed Dec 5, 2019
1 parent 057e6a4 commit 0bec113
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ commands:
name: Ensure paramcache is installed to project root
command: |
test -f ./paramcache \
|| (rustup run --install nightly cargo install filecoin-proofs --force --git=https://github.com/filecoin-project/rust-fil-proofs.git --branch=feat/params --bin=paramcache --root=./ \
|| (rustup run --install nightly cargo install filecoin-proofs --force --git=https://github.com/filecoin-project/rust-fil-proofs.git --branch=master --bin=paramcache --root=./ \
&& mv ./bin/paramcache ./paramcache)
no_output_timeout: 60m
build_and_run_tests:
Expand Down
14 changes: 7 additions & 7 deletions rust/Cargo.lock

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

4 changes: 2 additions & 2 deletions rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ publish = false
crate-type = ["rlib", "staticlib"]

[dependencies]
filecoin-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "feat/params" }
storage-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "feat/params" }
filecoin-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "master" }
storage-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "master" }
bls-signatures = { git = "https://github.com/filecoin-project/bls-signatures.git", branch = "master" }
byteorder = "1.2"
drop_struct_macro_derive = "0.4.0"
Expand Down

0 comments on commit 0bec113

Please sign in to comment.