diff options
| author | Philipp Krones <hello@philkrones.com> | 2018-12-12 18:17:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-12 18:17:00 +0100 |
| commit | 0cabbbdbb842fd81e27992e87070810374917679 (patch) | |
| tree | 5d123f8c23b22d7932f0fb58a96fa1cd8a462ef8 | |
| parent | c974ccaf40f1b39de01a36c300d1e67176f98ccc (diff) | |
| parent | 5527edd9569ffcf49236ea031626e39cbb75c52c (diff) | |
| download | rust-0cabbbdbb842fd81e27992e87070810374917679.tar.gz rust-0cabbbdbb842fd81e27992e87070810374917679.zip | |
Rollup merge of #3539 - flip1995:travis_osx_fix, r=oli-obk
Fix rvm/gpg bug in travis osx build Apparently this workaround isn't needed anymore ([travis](https://travis-ci.org/flip1995/rust-clippy/jobs/467027571)) and fixes the latest osx failures: [travis](https://travis-ci.org/rust-lang/rust-clippy/jobs/467013498#L152)
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 5014a66a79c..eb66112213b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,15 +18,6 @@ env: global: - RUST_BACKTRACE=1 -before_install: - - | - # work-around for issue https://github.com/travis-ci/travis-ci/issues/6307 - # might not be necessary in the future - if [ "$TRAVIS_OS_NAME" == "osx" ]; then - command curl -sSL https://rvm.io/mpapis.asc | gpg --import - - rvm get stable - fi - install: - | if [ -z ${INTEGRATION} ]; then |