Fix Version Number

.github/workflows/release.yaml

@@ -34,4 +34,4 @@ jobs:
           context: .
           push: true
           tags: git.kaisei.app/amatsugu/aoba:${{ env.VERSION }}
-          build-args: VERSION=${ env.VERSION }
+          build-args: VERSION=${{ env.VERSION }}

AobaClient/.env

@@ -0,0 +1 @@
+APP_VERSION=Debug

AobaClient/Cargo.lock

@@ -37,6 +37,7 @@ name = "aoba-client"
 version = "0.1.0"
 dependencies = [
  "dioxus",
+ "dotenv",
  "prost",
  "serde",
  "serde_repr",
@@ -673,6 +674,12 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "dotenv"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+
 [[package]]
 name = "dunce"
 version = "1.0.5"

AobaClient/Cargo.toml

@@ -19,6 +19,7 @@ web-sys = { version = "0.3.77", features = ["Storage", "Window"] }
 
 [build-dependencies]
 tonic-build = { version = "*", default-features = false, features = ["prost"] }
+dotenv = "0.15.0"
 
 [features]
 default = ["web"]

AobaClient/build.rs

@@ -1,3 +1,8 @@
+use dotenv::dotenv;
+use std::env;
+use std::fs::File;
+use std::io::Write;
+
 fn main() -> Result<(), Box<dyn std::error::Error>> {
 	tonic_build::configure()
 		.build_server(false)
@@ -6,6 +11,26 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 			&["../AobaServer/Proto/Aoba.proto", "../AobaServer/Proto/Auth.proto"],
 			&["../AobaServer/Proto/"],
 		)?;
-
+	forward_env();
 	Ok(())
 }
+
+fn forward_env() {
+	let dest_path = "./src/env.rs";
+	let mut f = File::create(&dest_path).unwrap();
+	f.write_all(b"// This file is automatically generated by build.rs\n\n")
+		.unwrap();
+
+	dotenv().ok();
+	for (key, value) in env::vars() {
+		if key.starts_with("APP_") {
+			f.write_all("#[allow(dead_code)]\n".as_bytes()).unwrap();
+			let line = format!(
+				"pub const {}: &'static str = \"{}\";\n",
+				key,
+				value.replace("\"", "\\\"")
+			);
+			f.write_all(line.as_bytes()).unwrap();
+		}
+	}
+}

AobaClient/src/components/navbar.rs

@@ -2,7 +2,7 @@ use std::env;
 
 use dioxus::prelude::*;
 
-use crate::{Route, contexts::AuthContext};
+use crate::{Route, contexts::AuthContext, env::APP_VERSION};
 
 const NAV_CSS: Asset = asset!("/assets/style/nav.scss");
 const NAV_ICON: Asset = asset!("/assets/favicon.ico");
@@ -49,7 +49,7 @@ pub fn Widgets() -> Element {
 #[component]
 pub fn Utils() -> Element {
 	let mut auth_context = use_context::<AuthContext>();
-	let version = env::var("APP_VERSION").unwrap_or("DEBUG".into());
+	let version = APP_VERSION;
 	rsx! {
 		div { class: "utils",
 			div { "{version}" }

AobaClient/src/env.rs

@@ -0,0 +1,4 @@
+// This file is automatically generated by build.rs
+
+#[allow(dead_code)]
+pub const APP_VERSION: &'static str = "Debug";

AobaClient/src/main.rs

@@ -1,5 +1,6 @@
 pub mod components;
 pub mod contexts;
+mod env;
 mod layouts;
 pub mod models;
 pub mod route;

AobaServer/Dockerfile

@@ -60,4 +60,5 @@ WORKDIR /app
 
 COPY --from=publish /app/publish .
 COPY --from=client-builder /bin/ffmpeg /bin/ffprobe /bin/ffplay /usr/bin/
+ENV APP_VERSION=$VERSION
 ENTRYPOINT ["dotnet", "AobaServer.dll"]