From 366d6abeb1c3ad673cbcd1f7d207c2e3e740e9cc Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 31 Oct 2024 10:46:34 -0700 Subject: [PATCH 1/2] fix build in master_ci (#33900) fix --- release/build_release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/build_release.sh b/release/build_release.sh index 62c2085300..8b26dc74ab 100755 --- a/release/build_release.sh +++ b/release/build_release.sh @@ -50,7 +50,7 @@ git commit -a -m "openpilot v$VERSION release" export PYTHONPATH="$BUILD_DIR" scons -j$(nproc) --minimal -if [ -z "PANDA_DEBUG_BUILD" ]; then +if [ -z "$PANDA_DEBUG_BUILD" ]; then # release panda fw CERT=/data/pandaextra/certs/release RELEASE=1 scons -j$(nproc) panda/ else From 4716629d7015833f94605aad6d6e7557255035a2 Mon Sep 17 00:00:00 2001 From: Maxime Desroches Date: Thu, 31 Oct 2024 11:50:58 -0700 Subject: [PATCH 2/2] add nightly-dev to tested_branches (#33901) fix test --- system/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/version.py b/system/version.py index 94964526b3..2d8a387bf7 100755 --- a/system/version.py +++ b/system/version.py @@ -11,7 +11,7 @@ from openpilot.common.swaglog import cloudlog from openpilot.common.git import get_commit, get_origin, get_branch, get_short_branch, get_commit_date RELEASE_BRANCHES = ['release3-staging', 'release3', 'nightly'] -TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging'] +TESTED_BRANCHES = RELEASE_BRANCHES + ['devel', 'devel-staging', 'nightly-dev'] BUILD_METADATA_FILENAME = "build.json"