From 45880b5b1214b82265b271189087d2edc7fa08ef Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 6 Feb 2017 15:29:40 +0100 Subject: Revert the ruby build infrastructure PR. The ruby build infrastructure PR caused our CI to get really sad, so I revert it here. This reverts commit 5eaddbc6f2a4b05ac59d9e8b29d0d2226d3f2015..44e02ff8185c5ad3da6448b6caff9d2a3a9b332f --- .travis.yml | 46 +++++++--------------------------------------- 1 file changed, 7 insertions(+), 39 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 0e1526b2..797ab53e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,40 +1,14 @@ sudo: false -os: - - linux - -dist: - - trusty - language: rust - -matrix: - include: - - rust: 1.13.0 - env: IMAG_RUBY_VERSION=2.3.3 - - rust: beta - env: IMAG_RUBY_VERSION=2.3.3 - - rust: stable - env: IMAG_RUBY_VERSION=2.3.3 - -cache: - cargo: true - directories: - - $TRAVIS_BUILD_DIR/libimagruby/vendor/bundle - -before_install: -- | - rvm install "$IMAG_RUBY_VERSION" - rvm use "$IMAG_RUBY_VERSION" - ruby --version - pushd libimagruby - bundle install --jobs=3 --retry=3 --path=$TRAVIS_BUILD_DIR/libimagruby/vendor/bundle - popd - +rust: +- 1.13.0 +- beta +- stable +cache: cargo before_script: - | pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH - script: - | make all test @@ -51,14 +25,12 @@ addons: - tree sources: - kalakris-cmake - after_success: - | pushd .imag-documentation && travis-cargo --only stable doc && travis-cargo --only stable doc-upload popd - notifications: email: on_success: never @@ -67,11 +39,7 @@ notifications: - chat.freenode.net#imag template: - "%{repository_name} (%{branch} @ %{commit} by %{author}): %{result}" - env: global: - - THERMITE_DEBUG_FILENAME=/tmp/thermite-debug.log - - secure: D+3exBnbvzFvk7fvLOxkF7UotCc4gBbvvOW4xGr9u6dDjEjV5y6CdDy/OQAkhfKhvSou+lIC22g5MuCBQXFEf/ua7A1XzwBAFeVLK4cWZSa7+ql6LdHKqOg3oF6pQlh095WeWr8S2PYJFFJFg8RGUPnbjqdu1J4KSXqe/7GoZ3lYS69mx7D5Hb93KEN084/KGfBuvyJtMjO1fK3spltL2zV8oqegFpv0gLG5GY4LsJ/7ij4Mc6wepXSyyQbaiA1eKMMwQZDvoi4V1mCulo/jeC3pucGxvgnMV5DZs8aa8R7votltGvSpHCgU78LW19dg8oZqwShQQ+XUYw27H+QK5V1lz1l1MaJLbwS3ySyZBPGH8qUuOzQ3bLp9xhAIRgCui3kX/UDhmeME7nJI6k3UZydh+/ydNB1BZHTKn76XS/yFj0Gcibxg7f5fcAYA6Ge5Sg+YPozuwbcKnKe6IpN2M7qNgWa+6MCSXJ1v4BgPb7kN74EynJUM8+yWEFN7MZtWEUQ4ZsHdCs8Pub4C/zHpYGV8qGenZwQzosAFq56YwoGCvJezz35yg4BDd3IMKenOzNnXLBrdxxqX8ySgwt5B3zBqwve/64Lx6OXjae2m8wZKlsmeqad/s6K7nx0zG15/qqRIzyvgcLXq3jwBaHkteq49FRFWvHQFpBQcsPZ2uH4= - matrix: - - IMAG_RUBY_VERSION=2.3.3 - - IMAG_RUBY_VERSION=2.4.0 + - 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= -- cgit v1.2.3