From 20887755430e52c8c41fb67968d866d8d123734b Mon Sep 17 00:00:00 2001
From: ntegan1 <ntegan1@gmail.com>
Date: Mon, 16 May 2022 21:53:02 -0400
Subject: [PATCH] Include master commit and build date in master-ci commit
 (#24548)

* save commit information in master-ci

* cleanup

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
---
 release/build_devel.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/release/build_devel.sh b/release/build_devel.sh
index 8028b74639..d2411da697 100755
--- a/release/build_devel.sh
+++ b/release/build_devel.sh
@@ -51,20 +51,23 @@ if [ ! -z "$EXTRA_FILES" ]; then
   cp -pR --parents $EXTRA_FILES $TARGET_DIR/
 fi
 
-# append source commit hash and build date to version
-GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse --short HEAD)
-DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
-VERSION=$(cat $SOURCE_DIR/selfdrive/common/version.h | awk -F\" '{print $2}')
-#echo "#define COMMA_VERSION \"$VERSION-$GIT_HASH-$DATETIME\"" > $TARGET_DIR/selfdrive/common/version.h
-
 # in the directory
 cd $TARGET_DIR
 rm -f panda/board/obj/panda.bin.signed
 
+# 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')
+VERSION=$(cat $SOURCE_DIR/selfdrive/common/version.h | awk -F\" '{print $2}')
+
 echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
 git status
-git commit -a -m "openpilot v$VERSION release"
+git commit -a -m "openpilot v$VERSION release
+
+date: $DATETIME
+master commit: $GIT_HASH
+"
 
 if [ ! -z "$BRANCH" ]; then
   echo "[-] Pushing to $BRANCH T=$SECONDS"