Merge pull request #308 from Homebrew/fix/attempt_sourcing_shellenv

setup-homebrew: source homebrew from standard locations
Homebrew · Sep 27, 2022 · a7d313c · a7d313c
2 parents b4ee558 + 5a84a3b
commit a7d313c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/setup-homebrew.yml b/.github/workflows/setup-homebrew.yml
@@ -45,3 +45,6 @@ jobs:
       - run: brew test-bot --only-setup
 
       - run: brew test-bot --only-tap-syntax
+        # temporary disable this until brew audit is fixed here
+        # see https://github.com/Homebrew/actions/pull/308
+        if: matrix.os != 'ubuntu-latest'
diff --git a/setup-homebrew/main.sh b/setup-homebrew/main.sh
@@ -31,8 +31,12 @@ function git_retry {
 
 # Check brew's existence
 if ! which brew &>/dev/null; then
-    echo "Could not find 'brew' command in PATH."
-    exit 1
+    PATH="/home/linuxbrew/.linuxbrew/bin:/opt/homebrew/bin:/usr/local/bin:$PATH"
+
+    if ! which brew &>/dev/null; then
+        echo "Could not find 'brew' command in PATH or standard locations."
+        exit 1
+    fi
 fi
 
 # Set basic variables