Merge branch 'master' into fedora_fixes

.kdiff3rc

@@ -98,7 +98,7 @@ Height 768=769
 Height 900=901
 Height 975=976
 Height 985=986
-State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
+State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
 ToolBarsMovable=Disabled
 Width 1366=1367
 Width 1440=1441

.travis.yml

@@ -5,10 +5,10 @@ script:
     - ./test 
 
 env:
-    - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
+    - DETECTED_OS=fedora:24     DOCKER_IMAGE=cyplo/fedora24_base
     - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
-    - DETECTED_OS=ubuntu:trusty
-    - DETECTED_OS=ubuntu:xenial
+    - DETECTED_OS=ubuntu:trusty DOCKER_IMAGE=cyplo/trusty_base
+    - DETECTED_OS=ubuntu:xenial DOCKER_IMAGE=cyplo/xenial_base
 
 sudo: required
 

common/configure_fresh_system

@@ -98,10 +98,12 @@ if [[ -z $NORUST ]]; then
         git pull
         git submodule update --init --recursive
     fi
-    cargo install -j $jobs_count -f rustfmt
-    cargo install -j $jobs_count -f racer
-    cargo install -j $jobs_count -f rustsym
-    cargo install -j $jobs_count -f ripgrep
+set +e
+    cargo install rustfmt
+    cargo install racer
+    cargo install rustsym
+    cargo install ripgrep
+set -e
 fi
 
 if [[ -z $NORUBY ]]; then