From 4b231e793d25b3d30940a44e6f2dde0a8f34ff94 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Fri, 26 Jan 2018 03:00:55 +0100 Subject: [PATCH 1/4] Fix Travis deprecation error. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 37944df572..0db9dcc563 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,10 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then HOMEBREW_REPOSITORY="$(brew --repo)"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; - mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; + mkdir -p "$PWD/Library/Taps/homebrew" + mv "$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" "$PWD/Library/homebrew/homebrew-core"; + git -C "$PWD/Library/homebrew/homebrew-core" fetch --tags --force origin + git -C "$PWD/Library/homebrew/homebrew-core" checkout --force -B master origin/master sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot; From 377528665a0c1a60629e6ff821c8b93b8663ac7f Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 26 Jan 2018 09:51:08 +0000 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0db9dcc563..efbdbedc04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,9 @@ before_install: - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then HOMEBREW_REPOSITORY="$(brew --repo)"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; - mkdir -p "$PWD/Library/Taps/homebrew" - mv "$HOMEBREW_REPOSITORY/Library/Taps/homebrew/homebrew-core" "$PWD/Library/homebrew/homebrew-core"; - git -C "$PWD/Library/homebrew/homebrew-core" fetch --tags --force origin - git -C "$PWD/Library/homebrew/homebrew-core" checkout --force -B master origin/master + mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; + git -C Library/homebrew/homebrew-core fetch --force origin + git -C Library/homebrew/homebrew-core checkout --force -B master origin/master sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot; From 50003d4ddcf2dd1ef63c5d1679492bb06b6038d3 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 26 Jan 2018 10:12:05 +0000 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index efbdbedc04..778d7da981 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ before_install: HOMEBREW_REPOSITORY="$(brew --repo)"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; - git -C Library/homebrew/homebrew-core fetch --force origin - git -C Library/homebrew/homebrew-core checkout --force -B master origin/master + git -C Library/Taps/homebrew/homebrew-core fetch --force origin + git -C Library/Taps/homebrew/homebrew-core checkout --force -B master origin/master sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot; From 5e465f08c4cc0508e549bd57d1be9cbd5df0a8b9 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 26 Jan 2018 10:32:04 +0000 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 778d7da981..241ac12bcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ before_install: HOMEBREW_REPOSITORY="$(brew --repo)"; sudo chown -R "$USER" "$HOMEBREW_REPOSITORY/Library/Taps"; mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library"; - git -C Library/Taps/homebrew/homebrew-core fetch --force origin - git -C Library/Taps/homebrew/homebrew-core checkout --force -B master origin/master + git -C Library/Taps/homebrew/homebrew-core fetch --force origin; + git -C Library/Taps/homebrew/homebrew-core checkout --force -B master origin/master; sudo rm -rf "$HOMEBREW_REPOSITORY"; sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY"; git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot;