Merge #23

23: Trust r=badboy

.travis.yml

@@ -1,39 +1,78 @@
+# Based on the "trust" template v0.1.1
+# https://github.com/japaric/trust/tree/v0.1.1
+
+dist: trusty
 language: rust
-sudo: false
+services: docker
+sudo: required
+
+env:
+  global:
+    - CRATE_NAME=signify
+
+matrix:
+  fast_finish: true
+
+  include:
+    # Linux
+    - env: TARGET=aarch64-unknown-linux-gnu
+      if: branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=arm-unknown-linux-gnueabi
+      if: branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=armv7-unknown-linux-gnueabihf
+      if: branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=x86_64-unknown-linux-gnu
+      if: type = pull_request OR branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=x86_64-unknown-linux-musl
+      if: branch = staging OR branch = trying OR branch =~ /^v\d+/
 
-branches:
-  only:
-    - staging
-    - trying
-    - master
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      if: type = pull_request OR branch = staging OR branch = trying OR branch =~ /^v\d+/
 
-os:
-  - linux
-  - osx
+    # other channels
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: nightly
+      if: type = pull_request OR branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=x86_64-unknown-linux-gnu
+      rust: beta
+      if: branch = staging OR branch = trying OR branch =~ /^v\d+/
+    - env: TARGET=x86_64-apple-darwin
+      os: osx
+      rust: nightly
+      if: type = pull_request OR branch = staging OR branch = trying OR branch =~ /^v\d+/
 
-# run builds for both all the trains
-rust:
-  - stable
-  - beta
-  - nightly
+before_install:
+  - set -e
+  - rustup self update
 
-before_script:
-  - |
-      pip install 'travis-cargo<0.2' --user &&
-      export PATH=$HOME/.local/bin:/Users/travis/Library/Python/2.7/bin:$PATH
+install:
+  - sh ci/install.sh
+  - source ~/.cargo/env || true
 
 script:
-  - |
-      travis-cargo build &&
-      travis-cargo test &&
-      travis-cargo --only stable doc
-  - ./tests/full-cycle.sh
-  - ./tests/integration.sh
-  - |
-      [ "$TRAVIS_OS_NAME" = "osx" ] || ./tests/compare.sh
+  - bash ci/script.sh
+
+after_script: set +e
+
+before_deploy:
+  - sh ci/before_deploy.sh
+
+deploy:
+  api_key:
+    secure: oakncmwVno3XQ5HU82FrHh6QXzbVt7GU9+pYryx5UX4L6qNrqcPFQjubOPZBhtDaljtgobwOgeQ03bsLwS68Z95imEPW5anWAMF0E4TClplGZBmGvrsS+1vLqoWnNS6+IecE1IwKRaZNqSya1dxbakl/tNqX0CMRwmZYTH+QOEFYR6Bd51yePc3Jdotg8LUFAbMaHBbRAsTIe6HGSf4VmImS1ouYDpgWiRYjmdCTBNBDQoaNQH2llx5MUcPpRbWlYT0xTKboJverj1xbI+xnSbw2ET3MHfk1a1J9F96CoyeQx9LHwgQC+NbIEf873NGaMSFKcKpQqeLh5OsgdknVtISN8OPrnGWmmm7fU/y9ke/3P8C41iV636w6E6W5ZWyWCowAbv2TEtnGf9ADBJDNwY4abpozSwULl52jSDg4jE6Mu59ZZ5NRzNQ1Wpnj1aExAEKw+N959UGt2b0UygKgP5KyRN1rZYAOPDaehy3TeaUC5gdjEro2teI79eFNQpJgF25/bxikzbxnDPvYKcHQo6XYyGU1hOyNnNe2JkOChVctEgQmO13iGuRDzDxfDf8iC5V8i3Cx11Kzt8qaW5WZK2rlluZZL2Gyg1wl7y5pjCmv6s2zCh1YAWwFw9AElPH3YRhNAd631cdJwQ2qk57DAnGMIGARMP2DHpoMORSho4Y=
+  file_glob: true
+  file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
+  on:
+    condition: $TRAVIS_RUST_VERSION = stable
+    tags: true
+  provider: releases
+  skip_cleanup: true
+
+cache: cargo
+before_cache:
+  - chmod -R a+r $HOME/.cargo
 
-env:
-  global:
-    - TRAVIS_CARGO_NIGHTLY_FEATURE=""
 notifications:
-  email: false
+  email:
+    on_success: never

appveyor.yml

@@ -1,19 +1,72 @@
-version: 1.0.{build}
-os:
-  - Visual Studio 2015
-clone_depth: 1
-configuration:
-  - Release
-platform:
-  - Win32
-  - x64
+# Based on the "trust" template v0.1.1
+# https://github.com/japaric/trust/tree/v0.1.1
+
 environment:
+  global:
+    RUST_VERSION: stable
+    CRATE_NAME: signify
+
   matrix:
-    - TOOLCHAIN_VERSION: 14.0
-      RUST: 1.21.0
+    - TARGET: i686-pc-windows-gnu
+    - TARGET: x86_64-pc-windows-gnu
+
+    - TARGET: i686-pc-windows-msvc
+    - TARGET: x86_64-pc-windows-msvc
+
+    # Testing other channels
+    - TARGET: x86_64-pc-windows-gnu
+      RUST_VERSION: nightly
+    - TARGET: x86_64-pc-windows-msvc
+      RUST_VERSION: nightly
+
+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:
+  - if [%APPVEYOR_REPO_TAG%]==[false] (
+      cargo build --target %TARGET% &&
+      cargo build --target %TARGET% --release &&
+      cargo test --target %TARGET% &&
+      cargo test --target %TARGET% --release
+    )
+
+before_deploy:
+  - cargo rustc --target %TARGET% --release --bin signify -- -C lto
+  - ps: ci\before_deploy.ps1
+
+deploy:
+  artifact: /.*\.zip/
+  auth_token:
+    secure: udMj7VQputi9ZmT3EV6P+b26R7V4pHmItuZFytnMH6hWCgWhqzFIVTxBeNOz8drj
+  description: ''
+  on:
+    RUST_VERSION: stable
+    appveyor_repo_tag: true
+  provider: GitHub
+
+cache:
+  - C:\Users\appveyor\.cargo\registry
+  - target
+
 branches:
   only:
-    - staging
+    # Release tags
+    - /^v\d+\.\d+\.\d+.*$/
     - master
+    - staging
+
+notifications:
+  - provider: Email
+    on_build_success: false
 
-build_script: mk/appveyor.bat
+build: false