diff --git a/build.sh b/build.sh index cc37fbb..8be8fd2 100755 --- a/build.sh +++ b/build.sh @@ -92,7 +92,7 @@ build_update () { if [ ! -z "${GIT_BRANCH}" ]; then GIT_INFO+=$'\n'"branch: $GIT_BRANCH"; fi if [ ! -z "${GIT_TAG}" ]; then GIT_INFO+=$'\n'"tag: $GIT_TAG"; fi if [ ! -z "${GIT_SHA}" ]; then GIT_INFO+=$'\n'"sha: $GIT_SHA"; fi - if [ ! -z "${GIT_MESSAGE}" ]; then GIT_INFO+=$'\n'"commit msg: $GIT_MESSAGE"; fi + if [ ! -z "${GIT_MESSAGE}" ]; then GIT_INFO+=$'\n'"msg: $GIT_MESSAGE"; fi python3 update.py \ --git "$GIT_INFO" \ --mcu ../controller/build/app/app.bin \ diff --git a/sw/deployer/src/main.rs b/sw/deployer/src/main.rs index 496de97..01b61a8 100644 --- a/sw/deployer/src/main.rs +++ b/sw/deployer/src/main.rs @@ -1,6 +1,6 @@ mod debug; mod n64; -pub mod sc64; // TODO: delete pub +pub mod sc64; use chrono::Local; use clap::{Args, Parser, Subcommand, ValueEnum}; diff --git a/sw/update/update.py b/sw/update/update.py index e6b08cb..8828577 100755 --- a/sw/update/update.py +++ b/sw/update/update.py @@ -220,8 +220,8 @@ if __name__ == "__main__": hostname = platform.node() creation_datetime = datetime.utcnow().strftime('%Y-%m-%d %H:%M:%S') update_info = '\n'.join([ - f'build system: {hostname}', - f'creation datetime: {creation_datetime}', + f'builder: {hostname}', + f'created: {creation_datetime}', ]) if (args.git): update_info += args.git