Merge branch 'master' into fedora_fixes

This commit is contained in:
Cyryl Płotnicki 2016-10-07 20:03:48 +02:00 committed by GitHub
commit d174874348
3 changed files with 10 additions and 8 deletions

View file

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

View file

@ -7,8 +7,8 @@ script:
env: 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=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
- DETECTED_OS=ubuntu:trusty - DETECTED_OS=ubuntu:trusty DOCKER_IMAGE=cyplo/trusty_base
- DETECTED_OS=ubuntu:xenial - DETECTED_OS=ubuntu:xenial DOCKER_IMAGE=cyplo/xenial_base
sudo: required sudo: required

View file

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