From 955345ef153ae115828e54e10128db6eaa7707e4 Mon Sep 17 00:00:00 2001 From: schaeff Date: Wed, 3 Apr 2019 18:19:36 +0200 Subject: [PATCH] add appveyor, travis, remove libsnark as default, add push to gh --- .travis.yml | 121 +++++++++++++++++++++++++++++++++++++ appveyor.yml | 74 +++++++++++++++++++++++ ci/before_deploy.ps1 | 23 +++++++ ci/before_deploy.sh | 33 ++++++++++ ci/install.sh | 47 ++++++++++++++ ci/script.sh | 24 ++++++++ zokrates_cli/Cargo.toml | 2 +- zokrates_stdlib/Cargo.toml | 4 -- 8 files changed, 323 insertions(+), 5 deletions(-) create mode 100644 .travis.yml create mode 100644 appveyor.yml create mode 100644 ci/before_deploy.ps1 create mode 100644 ci/before_deploy.sh create mode 100644 ci/install.sh create mode 100644 ci/script.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..9e3673f1 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,121 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +dist: trusty +language: rust +rust: + - nightly +services: docker +sudo: required + +env: + global: + - CRATE_NAME=zokrates + +matrix: + include: + # Android + - env: TARGET=aarch64-linux-android DISABLE_TESTS=1 + - env: TARGET=arm-linux-androideabi DISABLE_TESTS=1 + - env: TARGET=armv7-linux-androideabi DISABLE_TESTS=1 + - env: TARGET=i686-linux-android DISABLE_TESTS=1 + - env: TARGET=x86_64-linux-android DISABLE_TESTS=1 + + # iOS + - env: TARGET=aarch64-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=armv7-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=armv7s-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=i386-apple-ios DISABLE_TESTS=1 + os: osx + - env: TARGET=x86_64-apple-ios DISABLE_TESTS=1 + os: osx + + # Linux + - env: TARGET=aarch64-unknown-linux-gnu + - env: TARGET=arm-unknown-linux-gnueabi + - env: TARGET=armv7-unknown-linux-gnueabihf + - env: TARGET=i686-unknown-linux-gnu + - env: TARGET=i686-unknown-linux-musl + - env: TARGET=mips-unknown-linux-gnu + - env: TARGET=mips64-unknown-linux-gnuabi64 + - env: TARGET=mips64el-unknown-linux-gnuabi64 + - env: TARGET=mipsel-unknown-linux-gnu + - env: TARGET=powerpc-unknown-linux-gnu + - env: TARGET=powerpc64-unknown-linux-gnu + - env: TARGET=powerpc64le-unknown-linux-gnu + - env: TARGET=s390x-unknown-linux-gnu DISABLE_TESTS=1 + - env: TARGET=x86_64-unknown-linux-gnu + - env: TARGET=x86_64-unknown-linux-musl + + # OSX + - env: TARGET=i686-apple-darwin + os: osx + - env: TARGET=x86_64-apple-darwin + os: osx + + # *BSD + - env: TARGET=i686-unknown-freebsd DISABLE_TESTS=1 + - env: TARGET=x86_64-unknown-freebsd DISABLE_TESTS=1 + - env: TARGET=x86_64-unknown-netbsd DISABLE_TESTS=1 + + # Windows + - env: TARGET=x86_64-pc-windows-gnu + + # Bare metal + # These targets don't support std and as such are likely not suitable for + # most crates. + # - env: TARGET=thumbv6m-none-eabi + # - env: TARGET=thumbv7em-none-eabi + # - env: TARGET=thumbv7em-none-eabihf + # - env: TARGET=thumbv7m-none-eabi + + # Testing other channels + - env: TARGET=x86_64-unknown-linux-gnu + rust: nightly + - env: TARGET=x86_64-apple-darwin + os: osx + rust: nightly + +before_install: + - set -e + - rustup self update + +install: + - sh ci/install.sh + - source ~/.cargo/env || true + +script: + - bash ci/script.sh + +after_script: set +e + +before_deploy: + - sh ci/before_deploy.sh + +deploy: + api_key: + secure: i82/R0EkC7Ba0IvAg2mnC/aWOH/78tlL3ZrxpsUK0+QH4nntQXveKr7ynhmyM1cffwCQY+I/5oGHFV/9IvIRNuE0fmoUWYu5jC+e+3hcmy9MFzRPiKADDN1QYHDxGWNhkeJgeLm57/UMvwOT3t7dwjmyfi3kkMOzOtVDMbN57H75W++UKISb4viMfM6FlLnDEXViKFP0jx8pw19EN4PXZ4bbNgGCoNKT5tNqiykZfIQQ7o2EX7QBLHSfgsjCg1Fzon0KkSZtTui+qPY8ozIU/mq6baguFfnnGzL77eWW1t5faOTlxIl2zxoWU8qobhjupbQx5bgkeVCWpY94821hik/c3v0ytpjHFups/Aot/XOwp5C203TRN3dqoJkho841x7lbh+oxNtwR2NW2JllG6wU3rMvwkARZrAy73EqX8vEOM4XsZr5k7FiT5T2cxz90kyRq+CPqDQgBYNF2Pc+7JJq8/tbdnTZtdsAW0bBUADgBdPqNt+oQtjg7f4yYD9qbGPj/ooXzV0m+3X6jRJViUts2wCE6XWNk5UTiLIu3TjQZh7AP2NheGR7kyT2WPXmoe2ZhsNqWykwMMXPrl9tsfF7aZCUrml9Od+7mb5pbBZ2hsnthp0PJn/FrDAQt+EfKdDbZ/qhilGA7xrBOy8E9qc/IrJGf2TFJ6B7Cgms1I4E= + file_glob: true + file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.* + on: + tags: true + provider: releases + skip_cleanup: true + +cache: cargo +before_cache: + # Travis can't cache files that are not readable by "others" + - chmod -R a+r $HOME/.cargo + +branches: + only: + # release tags + - /^v\d+\.\d+\.\d+.*$/ + - master + +notifications: + email: + on_success: never diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..d15b4c7d --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,74 @@ +# Based on the "trust" template v0.1.2 +# https://github.com/japaric/trust/tree/v0.1.2 + +environment: + global: + # overridden on a case by case basis down below + RUST_VERSION: stable + + CRATE_NAME: zokrates + RUST_VERSION: nightly + + matrix: + # MinGW + - TARGET: i686-pc-windows-gnu + - TARGET: x86_64-pc-windows-gnu + + # MSVC + - TARGET: i686-pc-windows-msvc + - TARGET: x86_64-pc-windows-msvc + +install: + - ps: >- + If ($Env:TARGET -eq 'x86_64-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw64\bin' + } ElseIf ($Env:TARGET -eq 'i686-pc-windows-gnu') { + $Env:PATH += ';C:\msys64\mingw32\bin' + } + - curl -sSf -o rustup-init.exe https://win.rustup.rs/ + - rustup-init.exe -y --default-host %TARGET% --default-toolchain %RUST_VERSION% + - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin + - rustc -Vv + - cargo -V + +test_script: + # we don't run the "test phase" when doing deploys + - if [%APPVEYOR_REPO_TAG%]==[false] ( + cargo build --target %TARGET% && + cargo build --target %TARGET% --release && + cargo test --target %TARGET% && + cargo test --target %TARGET% --release && + cargo run --target %TARGET% && + cargo run --target %TARGET% --release + ) + +before_deploy: + - cargo rustc --target %TARGET% --release --bin zokrates -- -C lto + - ps: ci\before_deploy.ps1 + +deploy: + artifact: /.*\.zip/ + auth_token: + secure: WDSzWD7r4Il0ZvwjXA0JuJBmxPFuQSDTADKnmWL1mOLa7Pgzefo7HQqc6gtH/Vqd + description: '' + on: + RUST_VERSION: stable + appveyor_repo_tag: true + provider: GitHub + +cache: + - C:\Users\appveyor\.cargo\registry + - target + +branches: + only: + # Release tags + - /^v\d+\.\d+\.\d+.*$/ + - master + +# notifications: +# - provider: Email +# on_build_success: false + +# Building is done in the test phase, so we disable Appveyor's build phase. +build: false diff --git a/ci/before_deploy.ps1 b/ci/before_deploy.ps1 new file mode 100644 index 00000000..f0d2a054 --- /dev/null +++ b/ci/before_deploy.ps1 @@ -0,0 +1,23 @@ +# This script takes care of packaging the build artifacts that will go in the +# release zipfile + +$SRC_DIR = $PWD.Path +$STAGE = [System.Guid]::NewGuid().ToString() + +Set-Location $ENV:Temp +New-Item -Type Directory -Name $STAGE +Set-Location $STAGE + +$ZIP = "$SRC_DIR\$($Env:CRATE_NAME)-$($Env:APPVEYOR_REPO_TAG_NAME)-$($Env:TARGET).zip" + +# TODO Update this to package the right artifacts +Copy-Item "$SRC_DIR\target\$($Env:TARGET)\release\zokrates.exe" '.\' + +7z a "$ZIP" * + +Push-AppveyorArtifact "$ZIP" + +Remove-Item *.* -Force +Set-Location .. +Remove-Item $STAGE +Set-Location $SRC_DIR diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh new file mode 100644 index 00000000..e48f64b3 --- /dev/null +++ b/ci/before_deploy.sh @@ -0,0 +1,33 @@ +# This script takes care of building your crate and packaging it for release + +set -ex + +main() { + local src=$(pwd) \ + stage= + + case $TRAVIS_OS_NAME in + linux) + stage=$(mktemp -d) + ;; + osx) + stage=$(mktemp -d -t tmp) + ;; + esac + + test -f Cargo.lock || cargo generate-lockfile + + # TODO Update this to build the artifacts that matter to you + cross rustc --bin zokrates --target $TARGET --release -- -C lto + + # TODO Update this to package the right artifacts + cp target/$TARGET/release/zokrates $stage/ + + cd $stage + tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz * + cd $src + + rm -rf $stage +} + +main diff --git a/ci/install.sh b/ci/install.sh new file mode 100644 index 00000000..80e18e47 --- /dev/null +++ b/ci/install.sh @@ -0,0 +1,47 @@ +set -ex + +main() { + local target= + if [ $TRAVIS_OS_NAME = linux ]; then + target=x86_64-unknown-linux-musl + sort=sort + else + target=x86_64-apple-darwin + sort=gsort # for `sort --sort-version`, from brew's coreutils. + fi + + # Builds for iOS are done on OSX, but require the specific target to be + # installed. + case $TARGET in + aarch64-apple-ios) + rustup target install aarch64-apple-ios + ;; + armv7-apple-ios) + rustup target install armv7-apple-ios + ;; + armv7s-apple-ios) + rustup target install armv7s-apple-ios + ;; + i386-apple-ios) + rustup target install i386-apple-ios + ;; + x86_64-apple-ios) + rustup target install x86_64-apple-ios + ;; + esac + + # This fetches latest stable release + local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \ + | cut -d/ -f3 \ + | grep -E '^v[0.1.0-9.]+$' \ + | $sort --version-sort \ + | tail -n1) + curl -LSfs https://japaric.github.io/trust/install.sh | \ + sh -s -- \ + --force \ + --git japaric/cross \ + --tag $tag \ + --target $target +} + +main diff --git a/ci/script.sh b/ci/script.sh new file mode 100644 index 00000000..41f7c9ac --- /dev/null +++ b/ci/script.sh @@ -0,0 +1,24 @@ +# This script takes care of testing your crate + +set -ex + +# TODO This is the "test phase", tweak it as you see fit +main() { + cross build --target $TARGET + cross build --target $TARGET --release + + if [ ! -z $DISABLE_TESTS ]; then + return + fi + + # cross test --target $TARGET + # cross test --target $TARGET --release + + # cross run --target $TARGET + # cross run --target $TARGET --release +} + +# we don't run the "test phase" when doing deploys +if [ -z $TRAVIS_TAG ]; then + main +fi diff --git a/zokrates_cli/Cargo.toml b/zokrates_cli/Cargo.toml index 58caabdc..e60797d1 100644 --- a/zokrates_cli/Cargo.toml +++ b/zokrates_cli/Cargo.toml @@ -6,7 +6,7 @@ repository = "https://github.com/JacobEberhardt/ZoKrates.git" edition = "2018" [features] -default = ["libsnark"] +default = [] libsnark = ["zokrates_core/libsnark"] [dependencies] diff --git a/zokrates_stdlib/Cargo.toml b/zokrates_stdlib/Cargo.toml index a336b112..929dac39 100644 --- a/zokrates_stdlib/Cargo.toml +++ b/zokrates_stdlib/Cargo.toml @@ -4,10 +4,6 @@ version = "0.1.0" authors = ["Stefan Deml ", "schaeff "] edition = "2018" -[features] -default = ["libsnark"] -libsnark = ["zokrates_core/libsnark"] - [dev-dependencies] zokrates_field = { version = "0.3", path = "../zokrates_field" } zokrates_core = { version = "0.3", path = "../zokrates_core" }