sdeml
a7e5477d2b
Merge branch 'develop' into add-sharound
...
* develop:
Remove the tools directory
add doc, example and failing test for out of scope
Add zokrates_field to kcov
first build docker, then tag gh
clean env
revert dockerfile to original, enable master filter, enable push to dockerhub, git tag and mdbook
clean, move bot addr to env, silence commands
pass pw through stdin to silence warning
remove useless checks, rename env var
enable docker remote
add docker login, get mdbook from tar
allow wasm tests to fail
add integration_test job
use workflows
# Conflicts:
# .circleci/config.yml
2019-01-31 08:59:59 +01:00
Thibaut Schaeffer
4d3dd47841
Merge pull request #245 from gballet/remove-tools
...
Remove the tools directory
2019-01-30 18:36:46 +01:00
Guillaume Ballet
761d4b5904
Remove the tools directory
2019-01-30 08:59:05 -08:00
Thibaut Schaeffer
4aa5cd0147
Merge pull request #239 from Zokrates/modularize-circleci
...
Modularize CircleCI, add github tag, push to dockerhub
2019-01-30 15:02:30 +01:00
JacobEberhardt
d71f133e16
Merge pull request #241 from Zokrates/variable-scope-doc
...
Document variable scope
2019-01-29 11:37:25 +01:00
schaeff
f9cce777f0
add doc, example and failing test for out of scope
2019-01-29 11:24:16 +01:00
Thibaut Schaeffer
08c5baf53e
Merge pull request #240 from Zokrates/add-zokrates-field-to-kcov
...
Add zokrates_field to kcov
2019-01-29 10:27:07 +01:00
schaeff
f114b952ca
Add zokrates_field to kcov
2019-01-29 10:07:25 +01:00
schaeff
250c849a76
first build docker, then tag gh
2019-01-28 20:45:36 +01:00
schaeff
feca495f71
clean env
2019-01-28 20:44:12 +01:00
schaeff
14ea912ea2
revert dockerfile to original, enable master filter, enable push to dockerhub, git tag and mdbook
2019-01-28 20:35:19 +01:00
schaeff
231d7611cb
clean, move bot addr to env, silence commands
2019-01-28 20:22:40 +01:00
schaeff
4a58229dc6
pass pw through stdin to silence warning
2019-01-28 20:14:30 +01:00
schaeff
08cda8ed33
remove useless checks, rename env var
2019-01-28 20:05:43 +01:00
schaeff
7a14e0025f
enable docker remote
2019-01-28 19:55:09 +01:00
schaeff
3bc6ecae6a
add docker login, get mdbook from tar
2019-01-28 19:52:00 +01:00
schaeff
c594886596
allow wasm tests to fail
2019-01-28 15:02:30 +01:00
schaeff
ddaa961b89
add integration_test job
2019-01-28 14:55:13 +01:00
schaeff
d72169dba9
use workflows
2019-01-28 14:52:40 +01:00
Thibaut Schaeffer
17682a94af
Merge branch 'develop' into add-sharound
2019-01-28 10:22:21 +01:00
JacobEberhardt
6e7d368a74
Merge pull request #235 from Zokrates/clean-cli-hints
...
Clean CLI hints and error handling
2019-01-25 19:23:15 +01:00
Thibaut Schaeffer
25208ea1d4
Merge pull request #229 from Zokrates/fix-circleci-tag
...
Fix circleci tag
2019-01-25 16:42:52 +01:00
schaeff
04960faf46
Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into fix-circleci-tag
2019-01-25 15:50:34 +01:00
schaeff
b7f1747df6
Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into clean-cli-hints
2019-01-25 15:49:51 +01:00
Thibaut Schaeffer
74ba983731
Merge pull request #236 from Zokrates/deactivate-wasm-tests
...
Remove wasm tests from CI until fixed
2019-01-25 15:43:38 +01:00
schaeff
7df02b5e0e
remove wasm tests from CI
2019-01-25 15:37:45 +01:00
schaeff
10fbe003c3
improve error handling in CLI
2019-01-25 15:35:50 +01:00
schaeff
35896ec8a2
clean hints
2019-01-25 12:10:27 +01:00
schaeff
04e2d3e718
Merge branch 'add-sharound' of github.com:JacobEberhardt/ZoKrates into add-sharound
2019-01-24 22:30:07 +01:00
schaeff
d604faea37
rename NOT.code to not.code (yeah macos, I'm looking at you)
2019-01-24 22:28:48 +01:00
sdeml
277be7e6b9
clear cache
2019-01-24 21:58:33 +01:00
sdeml
3de75f9a3a
fix ZOKRATES_HOME path
2019-01-24 19:52:59 +01:00
sdeml
2b80b6ccd0
fix circleci
2019-01-24 18:09:29 +01:00
sdeml
6f163bcdb6
fix tests
2019-01-24 17:59:13 +01:00
sdeml
178572bbfe
set ENV ZOKRATES_HOME for circleci
2019-01-24 17:20:31 +01:00
sdeml
33bb047bf7
small refactor & update docs
2019-01-24 17:05:19 +01:00
sdeml
00147b3917
Merge branch 'develop' into add-sharound
...
* develop: (53 commits)
move book snippets to files in test folder, link to them from md
handle case where path is a directory
update cargo.lock
update tests to use relative paths
resolve cargo.lock conflict
WASM crate import depends on the presence of the `wasm` feature
Insert missing fi at the end of if statement
change test to check flattening of 1-sized array is identical to flattening of single value
implement variable access to ifelse array
add support for ifelse array access, clean up semantic treatment
recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already
add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file
remove commented out old serialization
branch based on first path component
base decision on first character of path
fallback to /Users/obit/.zokrates when importing source files
Run the tests with WASM enabled
Fix build after rebase
Fix warning
Move wasm plugin generation to a different repo
...
# Conflicts:
# zokrates_book/src/sha256example.md
2019-01-23 17:43:14 +01:00
schaeff
66d4244717
fix typo: change target to develop
2019-01-23 10:32:00 +01:00
Stefan
6b916e779f
Merge pull request #225 from Zokrates/if-else-array
...
Add support for IfElse for arrays
2019-01-22 14:54:43 +01:00
Stefan
df9dc36b03
Merge pull request #196 from Schaeff/optimize-subtraction
...
Optimize subtraction flattening
2019-01-22 14:54:30 +01:00
Stefan
0b99d60c08
Merge pull request #227 from Zokrates/test-book-snippets
...
Test book snippets
2019-01-21 20:28:46 +01:00
Stefan
16c5c845c2
Merge pull request #223 from Zokrates/add-zokrates-home
...
Change fs_resolver for stdlib
2019-01-21 19:09:43 +01:00
schaeff
0fe0cbef2c
move book snippets to files in test folder, link to them from md
2019-01-21 19:00:21 +01:00
Thibaut Schaeffer
3018c1ccbe
Merge branch 'develop' into optimize-subtraction
2019-01-21 14:25:59 +01:00
schaeff
ef5e8fff6c
merge dev
2019-01-21 14:21:03 +01:00
Thibaut Schaeffer
869a5bc87e
Merge pull request #216 from Zokrates/remove-manual-serialization
...
Derive serialization for FieldPrime
2019-01-21 14:16:35 +01:00
schaeff
138a792a69
handle case where path is a directory
2019-01-21 14:14:40 +01:00
schaeff
dc554fc036
resolve lock conflict...
2019-01-21 13:59:47 +01:00
schaeff
44b3b7dbc6
merge and resolve lock conflict
2019-01-21 13:57:16 +01:00
schaeff
d6521b295f
update cargo.lock
2019-01-21 13:55:43 +01:00
