From d9ad24f5af1d70162305b68f712a972e893627ae Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 12 May 2020 17:44:03 +0100 Subject: [PATCH] workflows/tests: fix for pre-installed Linuxbrew --- .github/workflows/tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e71e23aff0..4f6cf50084 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,8 @@ jobs: id: set-up-homebrew run: | if which brew &>/dev/null; then - HOMEBREW_REPOSITORY="$(brew --repo)" + HOMEBREW_PREFIX="$(brew --prefix)" + HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" else HOMEBREW_PREFIX=/home/linuxbrew/.linuxbrew HOMEBREW_REPOSITORY="$HOMEBREW_PREFIX/Homebrew" @@ -30,11 +31,11 @@ jobs: sudo mkdir -p bin etc include lib opt sbin share var/homebrew/linked Cellar sudo ln -sf ../Homebrew/bin/brew "$HOMEBREW_PREFIX/bin/" cd - - - export PATH="$HOMEBREW_PREFIX/bin:$PATH" - echo "::add-path::$HOMEBREW_PREFIX/bin" fi + export PATH="$HOMEBREW_PREFIX/bin:$PATH" + echo "::add-path::$HOMEBREW_PREFIX/bin" + cd "$HOMEBREW_REPOSITORY" rm -rf "$GITHUB_WORKSPACE" ln -s "$HOMEBREW_REPOSITORY" "$GITHUB_WORKSPACE"