From c533f185aea71c8aa6a31e0cd8ed2fb7fe8ae9d9 Mon Sep 17 00:00:00 2001
From: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date: Thu, 16 Feb 2023 23:10:40 -0500
Subject: [PATCH] Release branch build scripts and files (#35)

* Release branch build scripts and files

* Change author!
---
 release/build_release.sh | 80 ++++++++++++++++++++++------------------
 release/files_common     | 25 +++++++++++++
 release/identity.sh      |  8 ++--
 3 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/release/build_release.sh b/release/build_release.sh
index 60f81fce06..5d08389ef6 100755
--- a/release/build_release.sh
+++ b/release/build_release.sh
@@ -9,29 +9,24 @@ cd $DIR
 BUILD_DIR=/data/openpilot
 SOURCE_DIR="$(git rev-parse --show-toplevel)"
 
-if [ -f /TICI ]; then
-  FILES_SRC="release/files_tici"
-else
-  echo "no release files set"
-  exit 1
-fi
-
-if [ -z "$RELEASE_BRANCH" ]; then
-  echo "RELEASE_BRANCH is not set"
-  exit 1
-fi
+FILES_SRC="release/files_tici"
+RELEASE_BRANCH="prod-c3"
 
 
 # set git identity
 source $DIR/identity.sh
+export GIT_SSH_COMMAND="ssh -i /data/gitkey"
 
 echo "[-] Setting up repo T=$SECONDS"
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR
 git init
-git remote add origin git@github.com:commaai/openpilot.git
-git checkout --orphan $RELEASE_BRANCH
+# set git username/password
+source /data/identity.sh
+git remote add origin https://github.com/sunnyhaibin/sunnypilot.git
+git remote add devel https://github.com/sunnyhaibin/openpilot-special.git
+git fetch origin $RELEASE_BRANCH
 
 # do the files copy
 echo "[-] copying files T=$SECONDS"
@@ -44,19 +39,24 @@ cd $BUILD_DIR
 
 rm -f panda/board/obj/panda.bin.signed
 rm -f panda/board/obj/panda_h7.bin.signed
+rm -f panda/board/obj/bootstub.panda.bin
+rm -f panda/board/obj/bootstub.panda_h7.bin
 
-VERSION=$(cat common/version.h | awk -F[\"-]  '{print $2}')
-echo "#define COMMA_VERSION \"$VERSION-release\"" > common/version.h
+VERSION=$(date '+%Y.%m.%d')
+echo "#define COMMA_VERSION \"$VERSION\"" > common/version.h
 
 echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
-git commit -a -m "openpilot v$VERSION release"
+git commit -a -m "sunnypilot v$VERSION release"
+git branch --set-upstream-to=origin/$RELEASE_BRANCH
 
 # Build panda firmware
 pushd panda/
-CERT=/data/pandaextra/certs/release RELEASE=1 scons -u .
+scons -u .
 mv board/obj/panda.bin.signed /tmp/panda.bin.signed
 mv board/obj/panda_h7.bin.signed /tmp/panda_h7.bin.signed
+mv board/obj/bootstub.panda.bin /tmp/bootstub.panda.bin
+mv board/obj/bootstub.panda_h7.bin /tmp/bootstub.panda_h7.bin
 popd
 
 # Build
@@ -77,15 +77,20 @@ find . -name '*.o' -delete
 find . -name '*.os' -delete
 find . -name '*.pyc' -delete
 find . -name 'moc_*' -delete
+find . -name '*.cc' -delete
 find . -name '__pycache__' -delete
+find selfdrive/ui/ -name '*.h' -delete
 rm -rf panda/board panda/certs panda/crypto
 rm -rf .sconsign.dblite Jenkinsfile release/
 rm selfdrive/modeld/models/supercombo.onnx
-
+#rm models/supercombo_badweights.thneed
+rm -rf selfdrive/ui/replay/
 # Move back signed panda fw
 mkdir -p panda/board/obj
 mv /tmp/panda.bin.signed panda/board/obj/panda.bin.signed
 mv /tmp/panda_h7.bin.signed panda/board/obj/panda_h7.bin.signed
+mv /tmp/bootstub.panda.bin panda/board/obj/bootstub.panda.bin
+mv /tmp/bootstub.panda_h7.bin panda/board/obj/bootstub.panda_h7.bin
 
 # Restore third_party
 git checkout third_party/
@@ -93,30 +98,33 @@ git checkout third_party/
 # Mark as prebuilt release
 touch prebuilt
 
+# include source commit hash and build date in commit
+GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
+DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
+SP_VERSION=$(cat $SOURCE_DIR/common/version.h | awk -F\" '{print $2}')
+
 # Add built files to git
 git add -f .
-git commit --amend -m "openpilot v$VERSION"
+git commit --amend -m "sunnypilot v$VERSION
+version: sunnypilot v$SP_VERSION release
+date: $DATETIME
+master commit: $GIT_HASH
+"
+git branch -m prod-c3
 
 # Run tests
-TEST_FILES="tools/"
-cd $SOURCE_DIR
-cp -pR -n --parents $TEST_FILES $BUILD_DIR/
-cd $BUILD_DIR
-RELEASE=1 selfdrive/test/test_onroad.py
+#TEST_FILES="tools/"
+#cd $SOURCE_DIR
+#cp -pR -n --parents $TEST_FILES $BUILD_DIR/
+#cd $BUILD_DIR
+#RELEASE=1 selfdrive/test/test_onroad.py
 #selfdrive/manager/test/test_manager.py
-selfdrive/car/tests/test_car_interfaces.py
-rm -rf $TEST_FILES
+#selfdrive/car/tests/test_car_interfaces.py
+#rm -rf $TEST_FILES
 
-if [ ! -z "$RELEASE_BRANCH" ]; then
-  echo "[-] pushing release T=$SECONDS"
-  git push -f origin $RELEASE_BRANCH:$RELEASE_BRANCH
-fi
-
-if [ ! -z "$DASHCAM_BRANCH" ]; then
-  # Create dashcam
-  git rm selfdrive/car/*/carcontroller.py
-  git commit -m "create dashcam release from release"
-  git push -f origin $RELEASE_BRANCH:$DASHCAM_BRANCH
+if [ ! -z "$PUSH" ]; then
+  echo "[-] pushing T=$SECONDS"
+  git push -f origin $RELEASE_BRANCH
 fi
 
 echo "[-] done T=$SECONDS"
diff --git a/release/files_common b/release/files_common
index da7dfb0d3d..0b19ed02cc 100644
--- a/release/files_common
+++ b/release/files_common
@@ -9,6 +9,10 @@ SConstruct
 
 README.md
 RELEASES.md
+CHANGELOGS.md
+HOW-TOS.md
+sunnyhaibin0850_qrcode_paypal.me.png
+.github/FUNDING.yml
 docs/CARS.md
 docs/CONTRIBUTING.md
 docs/INTEGRATION.md
@@ -57,6 +61,9 @@ common/api/__init__.py
 
 release/*
 
+installer/custom/install_osm.sh
+installer/custom/install_osm_db.sh
+
 tools/__init__.py
 tools/lib/*
 tools/joystick/*
@@ -147,6 +154,13 @@ selfdrive/debug/vw_mqb_config.py
 selfdrive/gpxd/gpx_uploader.py
 selfdrive/gpxd/gpxd.py
 
+selfdrive/mapd/assets/*
+selfdrive/mapd/config.py
+selfdrive/mapd/mapd.py
+selfdrive/mapd/lib/*
+selfdrive/mapd/README.md
+selfdrive/mapd/sp_osm_db.json
+
 common/SConscript
 common/version.h
 
@@ -195,7 +209,10 @@ selfdrive/controls/lib/longcontrol.py
 selfdrive/controls/lib/longitudinal_planner.py
 selfdrive/controls/lib/pid.py
 selfdrive/controls/lib/radar_helpers.py
+selfdrive/controls/lib/speed_limit_controller.py
+selfdrive/controls/lib/turn_speed_controller.py
 selfdrive/controls/lib/vehicle_model.py
+selfdrive/controls/lib/vision_turn_controller.py
 
 selfdrive/controls/lib/lateral_mpc_lib/.gitignore
 selfdrive/controls/lib/longitudinal_mpc_lib/.gitignore
@@ -322,6 +339,7 @@ selfdrive/ui/qt/widgets/*.cc
 selfdrive/ui/qt/widgets/*.h
 selfdrive/ui/qt/maps/*.cc
 selfdrive/ui/qt/maps/*.h
+selfdrive/ui/qt/screenrecorder/*
 selfdrive/ui/qt/setup/*.cc
 selfdrive/ui/qt/setup/*.h
 
@@ -344,7 +362,9 @@ system/camerad/imgproc/utils.h
 
 selfdrive/manager/__init__.py
 selfdrive/manager/build.py
+selfdrive/manager/custom_dep.py
 selfdrive/manager/helpers.py
+selfdrive/manager/local_osm_install.py
 selfdrive/manager/manager.py
 selfdrive/manager/process_config.py
 selfdrive/manager/process.py
@@ -398,10 +418,13 @@ selfdrive/modeld/runners/run.h
 
 selfdrive/monitoring/dmonitoringd.py
 selfdrive/monitoring/driver_monitor.py
+selfdrive/monitoring/hands_on_wheel_monitor.py
 
 selfdrive/navd/__init__.py
 selfdrive/navd/navd.py
 selfdrive/navd/helpers.py
+selfdrive/navd/otisserv.py
+selfdrive/navd/tpl/*
 
 selfdrive/assets/.gitignore
 selfdrive/assets/assets.qrc
@@ -447,6 +470,8 @@ third_party/acados/acados_template/**
 third_party/bootstrap/**
 third_party/qt5/larch64/bin/**
 
+third_party/mapd/*
+
 scripts/update_now.sh
 scripts/stop_updater.sh
 
diff --git a/release/identity.sh b/release/identity.sh
index c699c94650..e88c77b3a4 100644
--- a/release/identity.sh
+++ b/release/identity.sh
@@ -1,4 +1,4 @@
-export GIT_COMMITTER_NAME="Vehicle Researcher"
-export GIT_COMMITTER_EMAIL="user@comma.ai"
-export GIT_AUTHOR_NAME="Vehicle Researcher"
-export GIT_AUTHOR_EMAIL="user@comma.ai"
+export GIT_COMMITTER_NAME="Jason Wen"
+export GIT_COMMITTER_EMAIL="haibin.wen3@gmail.com"
+export GIT_AUTHOR_NAME="Jason Wen"
+export GIT_AUTHOR_EMAIL="haibin.wen3@gmail.com"