Skip to content

Commit

Permalink
Merge pull request #838 from Zokrates/rc/0.7.1
Browse files Browse the repository at this point in the history
Release 0.7.1
  • Loading branch information
dark64 authored Apr 30, 2021
2 parents f38f837 + 810e12e commit 11f83ba
Show file tree
Hide file tree
Showing 143 changed files with 7,201 additions and 2,001 deletions.
133 changes: 126 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
version: 2
version: 2.1

executors:
linux:
machine:
image: ubuntu-2004:202101-01
macos:
macos:
xcode: 12.4.0

jobs:
build:
Expand Down Expand Up @@ -47,9 +55,6 @@ jobs:
- run:
name: Run clippy
command: cargo clippy -- -D warnings
- run:
name: Build
command: WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./build.sh
- run:
name: Run tests
command: WITH_LIBSNARK=1 RUSTFLAGS="-D warnings" ./test.sh
Expand Down Expand Up @@ -80,7 +85,9 @@ jobs:
- v4-cargo-cache-{{ arch }}-{{ checksum "Cargo.lock" }}
- run:
name: Test on firefox
command: cd zokrates_core && wasm-pack test --firefox --headless -- --no-default-features --features "wasm bellman"
command: |
cd zokrates_core
wasm-pack test --firefox --headless -- --no-default-features --features "wasm bellman"
integration_test:
docker:
- image: zokrates/env:latest
Expand Down Expand Up @@ -125,8 +132,88 @@ jobs:
- checkout
- run:
command: cd zokrates_js && npm run test
cross_build:
parameters:
os:
type: executor
target:
type: string
executor: << parameters.os >>
steps:
- checkout
- run:
name: Calculate dependencies
command: cargo generate-lockfile
- run:
no_output_timeout: "30m"
command: cross build --target << parameters.target >> --release
- tar_artifacts:
target: << parameters.target >>
publish_artifacts:
docker:
- image: circleci/golang
steps:
- attach_workspace:
at: /tmp/artifacts
- run:
name: "Publish artifacts on GitHub"
command: |
go get github.com/github-release/github-release
github-release release \
-s ${GH_TOKEN} \
-u ${CIRCLE_PROJECT_USERNAME} \
-r ${CIRCLE_PROJECT_REPONAME} \
-t ${CIRCLE_TAG} || true
find /tmp/artifacts -type f -name *.tar.gz -exec basename {} \; | xargs -I {} github-release upload \
-s ${GH_TOKEN} \
-u ${CIRCLE_PROJECT_USERNAME} \
-r ${CIRCLE_PROJECT_REPONAME} \
-t ${CIRCLE_TAG} \
-n "{}" \
-f /tmp/artifacts/{}
commands:
install_rust:
steps:
- run:
name: Install Rust
command: |
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
source $HOME/.cargo/env
install_cross:
steps:
- run:
name: Install rust-embedded/cross
command: cargo install --git https://github.com/rust-embedded/cross
tar_artifacts:
parameters:
target:
type: string
steps:
- run:
name: Store build artifacts
command: |
mkdir -p /tmp/artifacts
find target/<< parameters.target >>/release -maxdepth 1 -type f | grep -E "zokrates(\.exe)?$" | xargs -I {} cp {} /tmp/artifacts/
cp -r zokrates_stdlib/stdlib /tmp/artifacts/
cd /tmp/artifacts
tar czf zokrates-${CIRCLE_TAG}-<< parameters.target >>.tar.gz *
ls | grep -v *.tar.gz | xargs rm -rf
- store_artifacts:
path: /tmp/artifacts
- persist_to_workspace:
root: /tmp/artifacts
paths:
- zokrates-*-<< parameters.target >>.tar.gz

tag-only: &tag-only
filters:
branches:
ignore: /.*/
tags:
only: /^\d+\.\d+\.\d+$/

workflows:
version: 2
build-test-and-deploy:
jobs:
- build
Expand All @@ -136,6 +223,38 @@ workflows:
- integration_test
- zokrates_js_build
- zokrates_js_test
- cross_build:
<<: *tag-only
pre-steps:
- install_rust
- install_cross
matrix:
alias: cross-build-linux
parameters:
os:
- linux
target:
- aarch64-unknown-linux-gnu
- arm-unknown-linux-gnueabi
- x86_64-unknown-linux-gnu
- x86_64-pc-windows-gnu
- cross_build:
<<: *tag-only
pre-steps:
- install_rust
- install_cross
matrix:
alias: cross-build-macos
parameters:
os:
- macos
target:
- x86_64-apple-darwin
- publish_artifacts:
<<: *tag-only
requires:
- cross-build-linux
- cross-build-macos
- deploy:
filters:
branches:
Expand All @@ -148,4 +267,4 @@ workflows:
- wasm_test
- integration_test
- zokrates_js_build
- zokrates_js_test
- zokrates_js_test
75 changes: 0 additions & 75 deletions .travis.yml

This file was deleted.

21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,27 @@ All notable changes to this project will be documented in this file.
## [Unreleased]
https://github.com/Zokrates/ZoKrates/compare/latest...develop

## [0.7.1] - 2021-04-30

### Release
- https://github.com/Zokrates/ZoKrates/releases/tag/0.7.1

### Changes
- Fix integer inference on repeat operators (#834, @schaeff)
- Introduce constant definitions to the language (`const` keyword) (#792, @dark64)
- Introduce constant range checks for checks of the form `x < c` where `p` is a compile-time constant, also for other comparison operators. This works for any `x` and `p`, unlike dynamic `x < y` comparison (#761, @schaeff)
- Handle errors more gracefully in propagation step where applicable (#832, @dark64)
- Add interactive prompt before overwriting existing files in the `one_liner.sh` script (#831, @dark64)
- Add a custom panic hook to handle internal compiler errors more gracefully (#829, @dark64)
- Make command line errors compatible with editor cmd+click (#828, @schaeff)
- Make function definitions more permissive, and move ambiguity checks to call sites and improve them (#826, @schaeff)
- Detect assertion failures at compile time on constant expressions (#823, @dark64)
- Make function selection stricter in function calls (#822, @schaeff)
- Add the ability to import multiple symbols in a single import statement (#809, @dark64)
- Add [poseidon](https://www.poseidon-hash.info/) zk-friendly hashing algorithm to stdlib (#806, @dark64)
- Allow optional underscore before type suffix (e.g. `42_u32`) (#800, @dark64)
- Accept explicit generic parameters outside of definitions (#798, @schaeff)

## [0.7.0] - 2021-04-09

### Release
Expand Down
53 changes: 0 additions & 53 deletions ci/before_deploy.sh

This file was deleted.

49 changes: 0 additions & 49 deletions ci/install.sh

This file was deleted.

13 changes: 0 additions & 13 deletions ci/script.sh

This file was deleted.

1 change: 1 addition & 0 deletions rust-toolchain
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nightly-2021-04-25
2 changes: 2 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[toolchain]
channel = "nightly-2021-04-25"
Loading

0 comments on commit 11f83ba

Please sign in to comment.