From 6802232e2872cad9974e5ee98fbe9a52a3ee1cb9 Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 4 Jan 2018 20:39:17 +0200 Subject: [PATCH 1/4] Fix build Trying the work-around suggested at https://github.com/travis-ci/travis-ci/issues/6307 to fix the Travis CI MacOS build. --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8fe1be2ddfa..40a1287d1eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,9 @@ env: - secure: dj8SwwuRGuzbo2wZq5z7qXIf7P3p7cbSGs1I3pvXQmB6a58gkLiRn/qBcIIegdt/nzXs+Z0Nug+DdesYVeUPxk1hIa/eeU8p6mpyTtZ+30H4QVgVzd0VCthB5F/NUiPVxTgpGpEgCM9/p72xMwTn7AAJfsGqk7AJ4FS5ZZKhqFI= - RUST_BACKTRACE=1 +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi + install: - . $HOME/.nvm/nvm.sh - nvm install stable From 5068a1252d07b5338dc19dc7f4839cf02810bccd Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Thu, 4 Jan 2018 21:17:04 +0200 Subject: [PATCH 2/4] Fix build Adding gpg key import. --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 40a1287d1eb..e4b00e42fd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,11 @@ env: - RUST_BACKTRACE=1 before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then rvm get stable; fi + - | + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then + command curl -sSL https://rvm.io/mpapis.asc | gpg --import -; + rvm get stable + fi install: - . $HOME/.nvm/nvm.sh From 80f86633a96e7baef289b3d7fe03549677465cfb Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Sat, 6 Jan 2018 08:14:52 +0200 Subject: [PATCH 3/4] Make style consistent --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4b00e42fd1..22ac973cf6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,8 @@ env: before_install: - | - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then - command curl -sSL https://rvm.io/mpapis.asc | gpg --import -; + if [ "$TRAVIS_OS_NAME" == "osx" ]; then + command curl -sSL https://rvm.io/mpapis.asc | gpg --import - rvm get stable fi From 1afbe3203c97bf4f5d8aa7cb564c2e674b2eb36e Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Sat, 6 Jan 2018 08:31:39 +0200 Subject: [PATCH 4/4] Fix build Added comment --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 22ac973cf6f..92d48101254 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,8 @@ env: 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