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

Update proofs api #400

Merged
merged 4 commits into from
May 7, 2020
Merged

Update proofs api #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a4a84e
Update proofs lib
austinabell May 7, 2020
954e7cc
readd openCL on clippy
austinabell May 7, 2020
9f813f8
Lets add it here too, just to be safe
austinabell May 7, 2020
3a99fc3
Check to make sure this isn't the cache
austinabell May 7, 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
24 changes: 5 additions & 19 deletions .github/workflows/ci-rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
steps:
- uses: actions/checkout@v1

# TODO revisit this, workaround for now
- name: Install OpenCL
run: sudo apt install ocl-icd-opencl-dev

Expand Down Expand Up @@ -58,24 +57,8 @@ jobs:
steps:
- uses: actions/checkout@v1

- name: Cache cargo registry
uses: actions/cache@v1
with:
path: ~/.cargo/registry
key: ${{ runner.os }}-cargo-registry-v0-${{ github.sha }}
restore-keys: ${{ runner.os }}-cargo-registry-v0-
- name: Cache cargo index
uses: actions/cache@v1
with:
path: ~/.cargo/git
key: ${{ runner.os }}-cargo-index-v0-${{ github.sha }}
restore-keys: ${{ runner.os }}-cargo-index-v0-
- name: Cache target dir
uses: actions/cache@v1
with:
path: target
key: ${{ runner.os }}-cargo-build-target-v0-${{ github.sha }}
restore-keys: ${{ runner.os }}-cargo-build-target-v0-
- name: Install OpenCL
run: sudo apt install ocl-icd-opencl-dev

- uses: actions-rs/toolchain@v1
with:
Expand Down Expand Up @@ -106,6 +89,9 @@ jobs:
- name: Install Rust
run: rustup update beta && rustup default beta

- name: Install OpenCL
run: sudo apt install ocl-icd-opencl-dev

- name: Build documentation
run: cargo doc --no-deps --all-features
- name: Publish documentation
Expand Down
3 changes: 1 addition & 2 deletions utils/commcid/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ edition = "2018"
num-traits = "0.2"
num-derive = "0.3"
cid = { package = "forest_cid", path = "../../ipld/cid" }
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "b00d2e26c68e49b81e434739336383304b293395" }
neptune = "=0.5.4"
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "0e1c7cb464707c7a7ad82b0f8303f000f6f3fc8a" }

[dev-dependencies]
rand = "0.7.3"
3 changes: 1 addition & 2 deletions vm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ clock = { path = "../node/clock" }
thiserror = "1.0.11"
crypto = { path = "../crypto" }
commcid = { path = "../utils/commcid" }
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "b00d2e26c68e49b81e434739336383304b293395" }
neptune = "=0.5.4"
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "0e1c7cb464707c7a7ad82b0f8303f000f6f3fc8a" }
3 changes: 1 addition & 2 deletions vm/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ ipld_blockstore = { path = "../../ipld/blockstore" }
clock = { path = "../../node/clock" }
forest_encoding = { path = "../../encoding" }
commcid = { path = "../../utils/commcid" }
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "b00d2e26c68e49b81e434739336383304b293395" }
filecoin-proofs-api = { git = "https://github.com/filecoin-project/rust-filecoin-proofs-api", rev = "0e1c7cb464707c7a7ad82b0f8303f000f6f3fc8a" }
base64 = "0.12.0"
neptune = "=0.5.4"

[dev-dependencies]
interpreter = { path = "../interpreter/"}
Expand Down