ci(nightly): fix bundling

Author: eythaann

src/build.rs

@@ -14,18 +14,36 @@ fn main() {
         out.push_str(&format!("{:x}  {}\n", hash, path));
     });
 
-    let sums_path = PathBuf::from("./gen/SHA256SUMS");
+    let target_dir = target_dir();
+    let sums_path = target_dir.join("SHA256SUMS");
     std::fs::write(&sums_path, out).unwrap();
 
     if !cfg!(debug_assertions) {
         sign_sha256sums(&sums_path);
     } else {
-        std::fs::write("./gen/SHA256SUMS.sig", "NOT SIGNED NEEDED FOR DEBUG").unwrap();
+        std::fs::write(
+            sums_path.with_extension(".sig"),
+            "NOT SIGNED NEEDED FOR DEBUG",
+        )
+        .unwrap();
     }
 
     tauri_build::build();
 }
 
+fn target_dir() -> PathBuf {
+    let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
+    // see <https://github.com/rust-lang/cargo/issues/5457>
+    out_dir
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .parent()
+        .unwrap()
+        .to_path_buf()
+}
+
 fn read_folder_recursive<F>(path: PathBuf, cb: &mut F)
 where
     F: FnMut(PathBuf),
@@ -48,21 +66,15 @@ fn sign_sha256sums(path: &PathBuf) {
 
     let key_base64 =
         std::env::var("TAURI_SIGNING_PRIVATE_KEY").expect("TAURI_SIGNING_PRIVATE_KEY missing");
-
     let password = std::env::var("TAURI_SIGNING_PRIVATE_KEY_PASSWORD")
         .expect("TAURI_SIGNING_PRIVATE_KEY_PASSWORD missing");
 
-    // Decode the private key from base64 (following Tauri's pattern)
     let key_bytes = base64::engine::general_purpose::STANDARD
         .decode(&key_base64)
         .expect("Failed to decode base64 secret key");
-
     let key_str = String::from_utf8(key_bytes).expect("Secret key is not valid UTF-8");
 
-    // Load the secret key box from the string representation
     let sk_box = SecretKeyBox::from_string(&key_str).expect("Invalid secret key format");
-
-    // Decrypt the secret key using the password
     let secret_key = sk_box
         .into_secret_key(Some(password))
         .expect("Failed to decrypt secret key - invalid password");
@@ -76,11 +88,8 @@ fn sign_sha256sums(path: &PathBuf) {
         minisign::sign(None, &secret_key, data_reader, None, None).expect("Failed to sign data");
 
     // Write the signature to a .sig file
-    let mut sig_path = path.clone();
-    sig_path.set_extension("sig");
-
+    let sig_path = path.with_extension("sig");
     let mut file = std::fs::File::create(&sig_path).expect("Failed to create signature file");
-
     file.write_all(signature_box.to_string().as_bytes())
         .expect("Failed to write signature");
 

src/tauri.conf.json

@@ -41,9 +41,7 @@
     "licenseFile": "../LICENSE",
     "homepage": "https://github.com/eythaann/Seelen-UI",
     "resources": {
-      "static": "static",
-      "gen/SHA256SUMS": "SHA256SUMS",
-      "gen/SHA256SUMS.sig": "SHA256SUMS.sig"
+      "static": "static"
     },
     "targets": [
       "nsis"
@@ -67,17 +65,17 @@
           "bulgarian",
           "dutch",
           "english",
+          "french",
           "german",
           "japanese",
           "korean",
           "portuguesebr",
           "russian",
-          "tradchinese",
           "simpchinese",
-          "french",
           "spanish",
-          "turkish",
-          "swedish"
+          "swedish",
+          "tradchinese",
+          "turkish"
         ]
       }
     },

src/templates/installer-hooks.nsh

@@ -16,6 +16,8 @@
   ${EndIf}
 
   File /a "${__FILEDIR__}\..\..\sluhk.dll"
+  File /a "${__FILEDIR__}\..\..\SHA256SUMS"
+  File /a "${__FILEDIR__}\..\..\SHA256SUMS.sig"
 
   ; Include PDB file only for nightly builds
   ${StrLoc} $0 "${VERSION}" "nightly" ">"