Skip to content

Commit

Permalink
Merge pull request #490 from Zokrates/rc/0.5.0
Browse files Browse the repository at this point in the history
Release 0.5.0
  • Loading branch information
JacobEberhardt authored Oct 8, 2019
2 parents 6522cf0 + 2ae2a1e commit f7602b9
Show file tree
Hide file tree
Showing 355 changed files with 12,064 additions and 6,150 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
# - run:
# name: Check format
# command: rustup component add rustfmt-preview; cargo fmt --all -- --check
# command: rustup component add rustfmt; cargo fmt --all -- --check
- run:
name: Install libsnark prerequisites
command: ./scripts/install_libsnark_prerequisites.sh
Expand All @@ -54,9 +54,9 @@ jobs:
- run:
name: Run tests
command: ZOKRATES_HOME=$(pwd)/zokrates_stdlib/stdlib/ WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./test.sh
- run:
name: Generate code coverage report
command: ./scripts/cov.sh
# - run:
# name: Generate code coverage report
# command: ./scripts/cov.sh
wasm_test:
docker:
- image: rustlang/rust:nightly-slim
Expand Down
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@

# ZoKrates default files
out
out.code
out.wit
out.ztf
proof.json
proving.key
variables.inf
verification.key
verifier.sol
proof.json
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ matrix:
os: osx

# *BSD
- env: TARGET=x86_64-unknown-freebsd
# - env: TARGET=x86_64-unknown-freebsd

# Windows
- env: TARGET=x86_64-pc-windows-gnu
Expand Down
Loading

0 comments on commit f7602b9

Please sign in to comment.