1
0
Fork 0
mirror of synced 2025-09-23 12:18:44 +00:00
Commit graph

1007 commits

Author SHA1 Message Date
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
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
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
schaeff
aebb557dc7 update tests to use relative paths 2019-01-21 13:53:50 +01:00
schaeff
edd07957a5 resolve cargo.lock conflict 2019-01-21 13:48:17 +01:00
Thibaut Schaeffer
bb97e7942c
Merge pull request #203 from gballet/wasmi
Implement support for WASM helpers
2019-01-21 13:08:33 +01:00
Thibaut Schaeffer
a8379b1875
Merge pull request #226 from asifmallik/patch-1
Insert missing fi at the end of if statement
2019-01-21 13:04:15 +01:00
Guillaume Ballet
a025c59d84 WASM crate import depends on the presence of the wasm feature 2019-01-21 10:23:49 +01:00
Asif Mallik
86495b9436
Insert missing fi at the end of if statement 2019-01-19 01:27:33 -05:00
schaeff
ae7b5c0daa change test to check flattening of 1-sized array is identical to flattening of single value 2019-01-18 19:59:17 +01:00
schaeff
87fccb3457 implement variable access to ifelse array 2019-01-18 19:35:10 +01:00
schaeff
b74e0b6dc6 add support for ifelse array access, clean up semantic treatment 2019-01-18 18:56:56 +01:00
schaeff
e20f104c40 Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into if-else-array 2019-01-18 17:48:23 +01:00
schaeff
d0ae0402b8 recommend setting /Users/obit/sides/zokrates/zokrates_stdlib/stdlib if it is not already 2019-01-16 18:06:51 +01:00
schaeff
5c0b5e84ad add /Users/obit/sides/zokrates/zokrates_stdlib/stdlib to Dockerfiles, add stdlib with dummy file 2019-01-16 17:58:46 +01:00
schaeff
e1abb3e54b merge develop, resolve conflicts 2019-01-16 14:07:05 +01:00
schaeff
6955e811a2 remove commented out old serialization 2019-01-16 14:03:29 +01:00
schaeff
cb799a980f branch based on first path component 2019-01-15 16:18:44 +01:00
Stefan
f39214df65
Merge pull request #211 from Zokrates/doc/inequality-caveat
Add inequality caveat to doc
2019-01-15 15:25:41 +01:00
schaeff
cf2d241cd5 base decision on first character of path 2019-01-14 23:51:08 +01:00
JacobEberhardt
dbda37246f
Merge pull request #212 from Zokrates/doc/update-status-badges
Update status badges to circleci
2019-01-14 22:36:31 +01:00
schaeff
509609f56d use shields.io 2019-01-14 22:13:39 +01:00