diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2017-01-25 11:17:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 11:17:26 +0100 |
| commit | cd684b04ab696e7456d6ba6e51ebabcf96cb7f0f (patch) | |
| tree | 54ef3bd731a107b5558b3c52bab8e48655d7309d | |
| parent | ce36b38aa9ef25f8a0cc8f21860102b9950566a2 (diff) | |
| parent | 188b0636247124934c11cf335cbf24cc7d3fe9da (diff) | |
Merge pull request #860 from matthiasbeyer/travis-opt
Travis opt
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | bin/build.rs | 4 |
3 files changed, 4 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index f1b08921..797ab53e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,28 +5,13 @@ rust: - beta - stable 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: - | pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH script: - | - export RUSTFLAGS="-C codegen-units=2" - if [[ "$TEST_SUITE" == "binaries" ]]; then - make bin-test - else # $TEST_SUITE == "libraries" - make lib-test - fi + make all test addons: apt: @@ -55,9 +40,6 @@ notifications: template: - "%{repository_name} (%{branch} @ %{commit} by %{author}): %{result}" env: - matrix: - - TEST_SUITE=binaries - - TEST_SUITE=libraries global: - 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= @@ -60,7 +60,7 @@ release: $(RELEASE_TARGETS) imag-bin-release bin: $(BIN_TARGETS) imag-bin @$(ECHO) "\t[ALLBIN ]" -bin-test: $(BIN_TARGET_TESTS) +bin-test: $(BIN_TARGET_TESTS) imag-bin lib: $(LIB_TARGETS) @$(ECHO) "\t[ALLLIB ]" diff --git a/bin/build.rs b/bin/build.rs index 2be2c9fc..89eff3a1 100644 --- a/bin/build.rs +++ b/bin/build.rs @@ -76,8 +76,8 @@ fn main() { let outdir = std::env::var("OUT_DIR").unwrap(); // Actually generates the completion files - app.gen_completions("imag", Shell::Bash, outdir); - app.gen_completions("imag", Shell::Fish, outdir); + app.gen_completions("imag", Shell::Bash, outdir.clone()); + app.gen_completions("imag", Shell::Fish, outdir.clone()); app.gen_completions("imag", Shell::Zsh, outdir); } |