version: a new beginning (#1411)

* version: a new beginning

* changelog

* singular

* show ours

* actual

* readjust

* updated

* more

* official spelling

* more

* sync

* fix

* send it

* push

* we never had this lol

* syncs

.codespellignore

@@ -3,3 +3,4 @@ REGIST
 PullRequest
 cancelled
 FOF
+NoO

.github/workflows/sunnypilot-build-prebuilt.yaml

@@ -79,7 +79,7 @@ jobs:
             is_stable_branch="$(echo "$CONFIG" | jq -r '.stable_branch // false')";
             echo "is_stable_branch=$is_stable_branch" >> $GITHUB_OUTPUT
 
-            stable_version=$(cat common/version.h | grep COMMA_VERSION | sed -e 's/[^0-9|.]//g');
+            stable_version=$(cat sunnypilot/common/version.h | grep SUNNYPILOT_VERSION | sed -e 's/[^0-9|.]//g');
             echo "version=$([ "$is_stable_branch" = "true" ] && echo "$stable_version" || echo "$BUILD")" >> $GITHUB_OUTPUT
             echo "extra_version_identifier=${environment}" >> $GITHUB_OUTPUT
           fi

common/swaglog.cc

@@ -15,6 +15,8 @@
 #include "common/version.h"
 #include "system/hardware/hw.h"
 
+#include "sunnypilot/common/version.h"
+
 class SwaglogState {
 public:
   SwaglogState() {
@@ -56,7 +58,7 @@ public:
     if (char* daemon_name = getenv("MANAGER_DAEMON")) {
       ctx_j["daemon"] = daemon_name;
     }
-    ctx_j["version"] = COMMA_VERSION;
+    ctx_j["version"] = SUNNYPILOT_VERSION;
     ctx_j["dirty"] = !getenv("CLEAN");
     ctx_j["device"] = Hardware::get_name();
   }

common/tests/test_markdown.py

@@ -6,7 +6,7 @@ from openpilot.common.markdown import parse_markdown
 
 class TestMarkdown:
   def test_all_release_notes(self):
-    with open(os.path.join(BASEDIR, "RELEASES.md")) as f:
+    with open(os.path.join(BASEDIR, "CHANGELOG.md")) as f:
       release_notes = f.read().split("\n\n")
       assert len(release_notes) > 10
 

common/tests/test_swaglog.cc

@@ -9,6 +9,8 @@
 #include "system/hardware/hw.h"
 #include "third_party/json11/json11.hpp"
 
+#include "sunnypilot/common/version.h"
+
 std::string daemon_name = "testy";
 std::string dongle_id = "test_dongle_id";
 int LINE_NO = 0;
@@ -53,7 +55,7 @@ void recv_log(int thread_cnt, int thread_msg_cnt) {
     REQUIRE(ctx["dongle_id"].string_value() == dongle_id);
     REQUIRE(ctx["dirty"].bool_value() == true);
 
-    REQUIRE(ctx["version"].string_value() == COMMA_VERSION);
+    REQUIRE(ctx["version"].string_value() == SUNNYPILOT_VERSION);
 
     std::string device = Hardware::get_name();
     REQUIRE(ctx["device"].string_value() == device);

release/build_release.sh

@@ -39,7 +39,7 @@ cd $BUILD_DIR
 rm -f panda/board/obj/panda.bin.signed
 rm -f panda/board/obj/panda_h7.bin.signed
 
-VERSION=$(cat common/version.h | awk -F[\"-]  '{print $2}')
+VERSION=$(cat sunnypilot/common/version.h | awk -F[\"-]  '{print $2}')
 echo "[-] committing version $VERSION T=$SECONDS"
 git add -f .
 git commit -a -m "openpilot v$VERSION release"

release/build_stripped.sh

@@ -49,7 +49,7 @@ rm -f panda/board/obj/panda.bin.signed
 GIT_HASH=$(git --git-dir=$SOURCE_DIR/.git rev-parse HEAD)
 GIT_COMMIT_DATE=$(git --git-dir=$SOURCE_DIR/.git show --no-patch --format='%ct %ci' HEAD)
 DATETIME=$(date '+%Y-%m-%dT%H:%M:%S')
-VERSION=$(cat $SOURCE_DIR/common/version.h | awk -F\" '{print $2}')
+VERSION=$(cat $SOURCE_DIR/sunnypilot/common/version.h | awk -F\" '{print $2}')
 
 echo -n "$GIT_HASH" > git_src_commit
 echo -n "$GIT_COMMIT_DATE" > git_src_commit_date

release/ci/publish.sh

@@ -30,7 +30,7 @@ if [ -z "$GIT_ORIGIN" ]; then
 fi
 
 # "Tagging"
-echo "#define COMMA_VERSION \"$VERSION\"" > ${OUTPUT_DIR}/common/version.h
+echo "#define SUNNYPILOT_VERSION \"$VERSION\"" > ${OUTPUT_DIR}/sunnypilot/common/version.h
 
 ## set git identity
 #source $DIR/identity.sh
@@ -55,7 +55,7 @@ git add -f .
 # 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=$(awk -F\" '{print $2}' $SOURCE_DIR/common/version.h)
+SP_VERSION=$(awk -F\" '{print $2}' $SOURCE_DIR/sunnypilot/common/version.h)
 
 # Commit with detailed message
 git commit -a -m "sunnypilot v$VERSION

selfdrive/ui/tests/cycle_offroad_alerts.py

@@ -18,7 +18,7 @@ if __name__ == "__main__":
   while True:
     print("setting alert update")
     params.put_bool("UpdateAvailable", True)
-    r = open(os.path.join(BASEDIR, "RELEASES.md")).read()
+    r = open(os.path.join(BASEDIR, "CHANGELOG.md")).read()
     r = r[:r.find('\n\n')]  # Slice latest release notes
     params.put("UpdaterNewReleaseNotes", r + "\n")
 

selfdrive/ui/tests/test_ui/run.py

@@ -188,7 +188,7 @@ def setup_offroad_alert(click, pm: PubMaster, scroll=None):
 
 def setup_update_available(click, pm: PubMaster, scroll=None):
   Params().put_bool("UpdateAvailable", True)
-  release_notes_path = os.path.join(BASEDIR, "RELEASES.md")
+  release_notes_path = os.path.join(BASEDIR, "CHANGELOG.md")
   with open(release_notes_path) as file:
     release_notes = file.read().split('\n\n', 1)[0]
   Params().put("UpdaterNewReleaseNotes", release_notes + "\n")

sunnypilot/common/version.h

@@ -0,0 +1 @@
+#define SUNNYPILOT_VERSION "2025.001.000"

system/loggerd/logger.cc

@@ -11,6 +11,8 @@
 #include "common/swaglog.h"
 #include "common/version.h"
 
+#include "sunnypilot/common/version.h"
+
 // ***** log metadata *****
 kj::Array<capnp::word> logger_build_init_data() {
   uint64_t wall_time = nanos_since_epoch();
@@ -19,7 +21,7 @@ kj::Array<capnp::word> logger_build_init_data() {
   auto init = msg.initEvent().initInitData();
 
   init.setWallTimeNanos(wall_time);
-  init.setVersion(COMMA_VERSION);
+  init.setVersion(SUNNYPILOT_VERSION);
   init.setDirty(!getenv("CLEAN"));
   init.setDeviceType(Hardware::get_device_type());
 

system/updated/updated.py

@@ -82,7 +82,7 @@ def set_consistent_flag(consistent: bool) -> None:
 
 def parse_release_notes(basedir: str) -> bytes:
   try:
-    with open(os.path.join(basedir, "RELEASES.md"), "rb") as f:
+    with open(os.path.join(basedir, "CHANGELOG.md"), "rb") as f:
       r = f.read().split(b'\n\n', 1)[0]  # Slice latest release notes
     try:
       return bytes(parse_markdown(r.decode("utf-8")), encoding="utf-8")
@@ -294,7 +294,7 @@ class Updater:
       try:
         branch = self.get_branch(basedir)
         commit = self.get_commit_hash(basedir)[:7]
-        with open(os.path.join(basedir, "common", "version.h")) as f:
+        with open(os.path.join(basedir, "sunnypilot", "common", "version.h")) as f:
           version = f.read().split('"')[1]
 
         commit_unix_ts = run(["git", "show", "-s", "--format=%ct", "HEAD"], basedir).rstrip()

system/version.py

@@ -33,13 +33,13 @@ terms_version: str = "2"
 
 
 def get_version(path: str = BASEDIR) -> str:
-  with open(os.path.join(path, "common", "version.h")) as _versionf:
+  with open(os.path.join(path, "sunnypilot", "common", "version.h")) as _versionf:
     version = _versionf.read().split('"')[1]
   return version
 
 
 def get_release_notes(path: str = BASEDIR) -> str:
-  with open(os.path.join(path, "RELEASES.md")) as f:
+  with open(os.path.join(path, "CHANGELOG.md")) as f:
     return f.read().split('\n\n', 1)[0]
 
 

tools/replay/api.cc

@@ -14,6 +14,8 @@
 #include "common/version.h"
 #include "system/hardware/hw.h"
 
+#include "sunnypilot/common/version.h"
+
 namespace CommaApi2 {
 
 // Base64 URL-safe character set (uses '-' and '_' instead of '+' and '/')
@@ -141,7 +143,7 @@ std::string httpGet(const std::string &url, long *response_code) {
 
   // Handle headers
   struct curl_slist *headers = nullptr;
-  headers = curl_slist_append(headers, "User-Agent: openpilot-" COMMA_VERSION);
+  headers = curl_slist_append(headers, "User-Agent: openpilot-" SUNNYPILOT_VERSION);
   if (!token.empty()) {
     headers = curl_slist_append(headers, ("Authorization: JWT " + token).c_str());
   }

tools/replay/consoleui.cc

@@ -10,6 +10,8 @@
 #include "common/util.h"
 #include "common/version.h"
 
+#include "sunnypilot/common/version.h"
+
 namespace {
 
 const int BORDER_SIZE = 3;
@@ -119,7 +121,7 @@ void ConsoleUI::initWindows() {
 
   // set the title bar
   wbkgd(w[Win::Title], A_REVERSE);
-  mvwprintw(w[Win::Title], 0, 3, "sunnypilot replay %s", COMMA_VERSION);
+  mvwprintw(w[Win::Title], 0, 3, "sunnypilot replay %s", SUNNYPILOT_VERSION);
 
   // show windows on the real screen
   refresh();