Fix Travis

.travis.yml

@@ -7,7 +7,6 @@ env:
   global:
     - CRATE_NAME=tv-renamer
     - GTK=3.18
-    - PKG_CONFIG_ALLOW_CROSS=1
     - LD_LIBRARY_PATH="$HOME/local/lib/"
     - PKG_CONFIG_PATH="$HOME/local/lib/pkgconfig"
 
@@ -18,14 +17,11 @@ addons:
 
 matrix:
   include:
-    # Linux
-    - env: TARGET=i686-unknown-linux-gnu
     - env: TARGET=x86_64-unknown-linux-gnu
 
 before_install: set -e
 
 install:
-  - sh ci/install.sh
   - source ~/.cargo/env || true
 
 script:
@@ -47,8 +43,9 @@ deploy:
   file_glob: true
   file: $CRATE_NAME-$TRAVIS_TAG-$TARGET.*
   on:
-    condition: $TRAVIS_RUST_VERSION = stable
+    repo: mmstick/tv-renamer
     tags: true
+    all_branches: true
   provider: releases
   skip_cleanup: true
 
@@ -57,12 +54,6 @@ 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

appveyor.yml

@@ -46,7 +46,6 @@ deploy:
     secure: TQTFQzQN0mGOVWG8hxIOBFGixKTjxRFYN0lB+OCYW2gepNfvAAbXUScL1GKYwTDH
   description: ''
   on:
-    RUST_VERSION: stable
     appveyor_repo_tag: true
   provider: GitHub
 

ci/before_deploy.sh

@@ -17,7 +17,7 @@ main() {
 
     test -f Cargo.lock || cargo generate-lockfile
 
-    cross rustc --bin tv-renamer --target $TARGET --release -- -C lto
+    cargo rustc --bin tv-renamer --target $TARGET --release -- -C lto
 
     cp target/$TARGET/release/tv-renamer $stage/tv-renamer
     cp target/$TARGET/release/tv-renamer $stage/tv-renamer-gtk

ci/script.sh

@@ -3,13 +3,13 @@
 set -ex
 
 main() {
-    cross build --target $TARGET
+    cargo build --target $TARGET
 
     if [ ! -z $DISABLE_TESTS ]; then
         return
     fi
 
-    cross test --target $TARGET
+    cargo test --target $TARGET
 }
 
 # we don't run the "test phase" when doing deploys