matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Merge pull request #860 from matthiasbeyer/travis-opt

Browse source 
Travis opt
This commit is contained in:
Matthias Beyer 2017-01-25 11:17:26 +01:00 committed by GitHub
commit cd684b04ab
3 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.travis.yml
View file

@ -5,28 +5,13 @@ rust:
- beta - beta
- stable - stable
cache: cargo cache: cargo
before_install:
- |
c=$(git diff $(git merge-base master $TRAVIS_COMMIT)..$TRAVIS_COMMIT --name-only | cut -d "/" -f 1 | uniq)
if [[ "$c" == "doc" ]]; then
echo "Only changes in DOC, exiting 0"
exit 0
else
echo "Changes in other directories than ./doc"
echo "continue build..."
fi
before_script: before_script:
- | - |
pip install 'travis-cargo<0.2' --user && pip install 'travis-cargo<0.2' --user &&
export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.local/bin:$PATH
script: script:
- | - |
export RUSTFLAGS="-C codegen-units=2" make all test
if [[ "$TEST_SUITE" == "binaries" ]]; then
make bin-test
else # $TEST_SUITE == "libraries"
make lib-test
fi
addons: addons:
apt: apt:
@ -55,9 +40,6 @@ notifications:
template: template:
- "%{repository_name} (%{branch} @ %{commit} by %{author}): %{result}" - "%{repository_name} (%{branch} @ %{commit} by %{author}): %{result}"
env: env:
matrix:
- TEST_SUITE=binaries
- TEST_SUITE=libraries
global: global:
- TRAVIS_CARGO_NIGHTLY_FEATURE=dev - TRAVIS_CARGO_NIGHTLY_FEATURE=dev
- secure: D+3exBnbvzFvk7fvLOxkF7UotCc4gBbvvOW4xGr9u6dDjEjV5y6CdDy/OQAkhfKhvSou+lIC22g5MuCBQXFEf/ua7A1XzwBAFeVLK4cWZSa7+ql6LdHKqOg3oF6pQlh095WeWr8S2PYJFFJFg8RGUPnbjqdu1J4KSXqe/7GoZ3lYS69mx7D5Hb93KEN084/KGfBuvyJtMjO1fK3spltL2zV8oqegFpv0gLG5GY4LsJ/7ij4Mc6wepXSyyQbaiA1eKMMwQZDvoi4V1mCulo/jeC3pucGxvgnMV5DZs8aa8R7votltGvSpHCgU78LW19dg8oZqwShQQ+XUYw27H+QK5V1lz1l1MaJLbwS3ySyZBPGH8qUuOzQ3bLp9xhAIRgCui3kX/UDhmeME7nJI6k3UZydh+/ydNB1BZHTKn76XS/yFj0Gcibxg7f5fcAYA6Ge5Sg+YPozuwbcKnKe6IpN2M7qNgWa+6MCSXJ1v4BgPb7kN74EynJUM8+yWEFN7MZtWEUQ4ZsHdCs8Pub4C/zHpYGV8qGenZwQzosAFq56YwoGCvJezz35yg4BDd3IMKenOzNnXLBrdxxqX8ySgwt5B3zBqwve/64Lx6OXjae2m8wZKlsmeqad/s6K7nx0zG15/qqRIzyvgcLXq3jwBaHkteq49FRFWvHQFpBQcsPZ2uH4= - secure: D+3exBnbvzFvk7fvLOxkF7UotCc4gBbvvOW4xGr9u6dDjEjV5y6CdDy/OQAkhfKhvSou+lIC22g5MuCBQXFEf/ua7A1XzwBAFeVLK4cWZSa7+ql6LdHKqOg3oF6pQlh095WeWr8S2PYJFFJFg8RGUPnbjqdu1J4KSXqe/7GoZ3lYS69mx7D5Hb93KEN084/KGfBuvyJtMjO1fK3spltL2zV8oqegFpv0gLG5GY4LsJ/7ij4Mc6wepXSyyQbaiA1eKMMwQZDvoi4V1mCulo/jeC3pucGxvgnMV5DZs8aa8R7votltGvSpHCgU78LW19dg8oZqwShQQ+XUYw27H+QK5V1lz1l1MaJLbwS3ySyZBPGH8qUuOzQ3bLp9xhAIRgCui3kX/UDhmeME7nJI6k3UZydh+/ydNB1BZHTKn76XS/yFj0Gcibxg7f5fcAYA6Ge5Sg+YPozuwbcKnKe6IpN2M7qNgWa+6MCSXJ1v4BgPb7kN74EynJUM8+yWEFN7MZtWEUQ4ZsHdCs8Pub4C/zHpYGV8qGenZwQzosAFq56YwoGCvJezz35yg4BDd3IMKenOzNnXLBrdxxqX8ySgwt5B3zBqwve/64Lx6OXjae2m8wZKlsmeqad/s6K7nx0zG15/qqRIzyvgcLXq3jwBaHkteq49FRFWvHQFpBQcsPZ2uH4=

2
Makefile
View file

@ -60,7 +60,7 @@ release: $(RELEASE_TARGETS) imag-bin-release
bin: $(BIN_TARGETS) imag-bin bin: $(BIN_TARGETS) imag-bin
@$(ECHO) "\t[ALLBIN ]" @$(ECHO) "\t[ALLBIN ]"
bin-test: $(BIN_TARGET_TESTS) bin-test: $(BIN_TARGET_TESTS) imag-bin
lib: $(LIB_TARGETS) lib: $(LIB_TARGETS)
@$(ECHO) "\t[ALLLIB ]" @$(ECHO) "\t[ALLLIB ]"

4
bin/build.rs
View file

@ -76,8 +76,8 @@ fn main() {
let outdir = std::env::var("OUT_DIR").unwrap(); let outdir = std::env::var("OUT_DIR").unwrap();
// Actually generates the completion files // Actually generates the completion files
app.gen_completions("imag", Shell::Bash, outdir); app.gen_completions("imag", Shell::Bash, outdir.clone());
app.gen_completions("imag", Shell::Fish, outdir); app.gen_completions("imag", Shell::Fish, outdir.clone());
app.gen_completions("imag", Shell::Zsh, outdir); app.gen_completions("imag", Shell::Zsh, outdir);
} }