From 7f6de5119f1654a25d04bae7eab8dab5a6888fc0 Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:02:09 +0100 Subject: [PATCH] use git hash for netplay sync (#234) * use git hash for netplay sync * more --- build.rs | 8 ++++++++ src/ui/gui/gui_netplay.rs | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build.rs b/build.rs index 807dcd3..08b1e6c 100644 --- a/build.rs +++ b/build.rs @@ -166,4 +166,12 @@ fn main() { println!("cargo:rustc-link-search=native=/usr/local/lib"); println!("cargo:rustc-link-lib=static=MoltenVK"); } + + let git_output = std::process::Command::new("git") + .args(["rev-parse", "HEAD"]) + .output() + .unwrap(); + + let git_hash = String::from_utf8(git_output.stdout).unwrap(); + println!("cargo:rustc-env=GIT_HASH={}", git_hash); } diff --git a/src/ui/gui/gui_netplay.rs b/src/ui/gui/gui_netplay.rs index 5534987..13ce59e 100644 --- a/src/ui/gui/gui_netplay.rs +++ b/src/ui/gui/gui_netplay.rs @@ -284,7 +284,7 @@ pub fn netplay_create(app: &mut GopherEguiApp, ctx: &egui::Context) { let netplay_message = NetplayMessage { message_type: "request_create_room".to_string(), player_name: Some(app.netplay.player_name.clone()), - client_sha: Some(env!("CARGO_PKG_VERSION").to_string()), + client_sha: Some(env!("GIT_HASH").to_string()), netplay_version: Some(NETPLAY_VERSION), emulator: Some(EMU_NAME.to_string()), accept: None, @@ -449,7 +449,7 @@ pub fn netplay_join(app: &mut GopherEguiApp, ctx: &egui::Context) { let netplay_message = NetplayMessage { message_type: "request_join_room".to_string(), player_name: Some(app.netplay.player_name.clone()), - client_sha: Some(env!("CARGO_PKG_VERSION").to_string()), + client_sha: Some(env!("GIT_HASH").to_string()), netplay_version: None, emulator: None, accept: None,