diff --git a/.gitignore b/.gitignore index a87a813..0400326 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ .DS_Store *.o __pycache__ +Cargo.lock diff --git a/.travis.yml b/.travis.yml index 4e00a45..9d6c7df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,55 @@ +# Copied from https://github.com/kennytm/extprim/blob/master/.travis.yml :) + language: rust sudo: false + +addons: + apt: + packages: + - libcurl4-openssl-dev + - libelf-dev + - libdw-dev + - binutils-dev + - gcc-multilib + +os: + - linux + - osx + +rust: + - 1.8.0 + - nightly + +env: + global: + - TRAVIS_CARGO_NIGHTLY_FEATURE=bench + matrix: + - ARCH=x86_64 + - ARCH=i686 + matrix: - include: - - rust: stable - - rust: beta - - rust: nightly + allow_failures: + - env: ARCH=i686 + # FIXME: all i686 build panics with the message "Box", cause all `should_panic` tests to fail. + +install: + - if [ "$TRAVIS_OS_NAME" = 'linux' ]; then OS=unknown-linux-gnu; else OS=apple-darwin; fi + - SYSROOT=$(rustc --print sysroot) + - export HOST=$ARCH-$OS + - | + if [ ! -d "$SYSROOT/lib/rustlib/$HOST" ]; then + curl -SfLO "https://static.rust-lang.org/dist/rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz" && + tar xf "rust-$TRAVIS_RUST_VERSION-$HOST.tar.gz" "rust-$TRAVIS_RUST_VERSION-$HOST/rust-std-$HOST/lib/rustlib/$HOST" && + mv "rust-$TRAVIS_RUST_VERSION-$HOST/rust-std-$HOST/lib/rustlib/$HOST" "$SYSROOT/lib/rustlib" + fi + +before_script: + - pip install 'travis-cargo<0.2' --user + - export PATH=$HOME/.local/bin:$HOME/Library/Python/2.7/bin:$PATH + +script: + - cargo test --target "$HOST" + - travis-cargo bench -- --target "$HOST" after_success: - - cargo doc - - curl https://raw.githubusercontent.com/kmcallister/travis-doc-upload/master/travis-doc-upload.sh | sh + - travis-cargo coveralls --no-sudo --verify diff --git a/README.md b/README.md index 75a20c8..a822cc2 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,16 @@ qrcode-rust =========== [![Build status](https://travis-ci.org/kennytm/qrcode-rust.svg?branch=master)](https://travis-ci.org/kennytm/qrcode-rust) +[![Coverage Status](https://coveralls.io/repos/github/kennytm/qrcode-rust/badge.svg?branch=coveralls)](https://coveralls.io/github/kennytm/qrcode-rust?branch=coveralls) +[![crates.io](http://meritbadge.herokuapp.com/qrcode)](https://crates.io/crates/qrcode) +[![Apache 2.0](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](./LICENSE) QR code and Micro QR code encoder in Rust. ```toml # Cargo.toml -[dependencies.qrcode] -git = "https://github.com/kennytm/qrcode-rust" +[dependencies] +qrcode = "0.1.7" ``` diff --git a/scripts/id_rsa.enc b/scripts/id_rsa.enc deleted file mode 100644 index 4954ee6..0000000 Binary files a/scripts/id_rsa.enc and /dev/null differ diff --git a/scripts/travis-doc-upload.cfg b/scripts/travis-doc-upload.cfg deleted file mode 100644 index d30b709..0000000 --- a/scripts/travis-doc-upload.cfg +++ /dev/null @@ -1,3 +0,0 @@ -PROJECT_NAME=qrcode-rust -DOCS_REPO=kennytm/qrcode-rust.git -SSH_KEY_TRAVIS_ID=cbc3a9ac2cf3