CI: ensure no brew (#37387)

This commit is contained in:
Adeeb Shihadeh
2026-02-24 18:49:59 -08:00
committed by GitHub
parent 0b6da2077f
commit 8810948eca
4 changed files with 11 additions and 6 deletions
-4
View File
@@ -26,10 +26,6 @@ runs:
exit 1
fi
# do this after checkout to ensure our custom LFS config is used to pull from GitLab
- shell: bash
run: git lfs pull
# build cache
- id: date
shell: bash
+4
View File
@@ -66,6 +66,10 @@ jobs:
- uses: actions/checkout@v6
with:
submodules: true
- name: Remove Homebrew from environment
run: |
FILTERED=$(echo "$PATH" | tr ':' '\n' | grep -v '/opt/homebrew' | tr '\n' ':')
echo "PATH=${FILTERED}/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" >> $GITHUB_ENV
- uses: ./.github/workflows/setup-with-retry
- name: Building openpilot
run: scons
+5 -2
View File
@@ -6,8 +6,11 @@ Import('env', 'arch', 'common', 'messaging', 'visionipc', 'cereal')
# Detect Qt - skip build if not available
if arch == "Darwin":
brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
has_qt = os.path.isdir(os.path.join(brew_prefix, "opt/qt@5"))
try:
brew_prefix = subprocess.check_output(['brew', '--prefix'], encoding='utf8').strip()
has_qt = os.path.isdir(os.path.join(brew_prefix, "opt/qt@5"))
except (FileNotFoundError, subprocess.CalledProcessError):
has_qt = False
else:
has_qt = shutil.which('qmake') is not None
+2
View File
@@ -225,6 +225,8 @@ function op_setup() {
et="$(date +%s)"
echo -e "[${GREEN}${NC}] Dependencies installed successfully in $((et - st)) seconds."
op_activate_venv
echo "Getting git submodules..."
st="$(date +%s)"
if ! git submodule update --jobs 4 --init --recursive; then