Merge pull request #7472 from MikeMcQuaid/path-tweaks

workflows/tests: simplify PATH setup.
This commit is contained in:
Mike McQuaid 2020-04-30 17:23:30 +01:00 committed by GitHub
commit 3e20393975
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,14 +14,6 @@ jobs:
matrix:
os: [ubuntu-latest, macOS-latest]
steps:
- name: Set up Homebrew PATH
run: |
if [ "$RUNNER_OS" = "Linux" ]; then
echo "::add-path::/home/linuxbrew/.linuxbrew/bin"
else
echo "::add-path::/usr/local/bin"
fi
- name: Set up Homebrew
run: |
if which brew &>/dev/null; then
@ -37,6 +29,9 @@ 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
cd "$HOMEBREW_REPOSITORY"