sync: fix upstream conflicts

Co-authored-by: royjr <royjr96@gmail.com>
This commit is contained in:
royjr
2026-07-16 01:04:49 -04:00
committed by Jason Wen
parent 14318d2f09
commit 560cde61ae
380 changed files with 357 additions and 665 deletions
+7 -1
View File
@@ -45,7 +45,7 @@ jobs:
max_attempts: 3
command: git lfs pull
- name: Build devel
timeout-minutes: 1
timeout-minutes: 3
run: TARGET_DIR=$STRIPPED_DIR tools/release/build_stripped.sh
- run: ./tools/op.sh setup
- name: Build openpilot and run checks
@@ -116,6 +116,9 @@ jobs:
steps:
- uses: actions/checkout@v7
- run: ./tools/op.sh setup
- name: Install raylib headless dependencies
if: ${{ !contains(runner.name, 'nsc') }}
run: sudo apt-get install -y --no-install-recommends libgles2 libegl1
- name: Build openpilot
run: scons
- name: Run unit tests
@@ -230,6 +233,9 @@ jobs:
steps:
- uses: actions/checkout@v7
- run: ./tools/op.sh setup
- name: Install raylib headless dependencies
if: ${{ !contains(runner.name, 'nsc') }}
run: sudo apt-get install -y --no-install-recommends libgles2 libegl1
- name: Build openpilot
run: scons
- name: Create UI Report