Merge branch 'commaai:master' into move-alphalong-to-developerpanel

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

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"