ci: add vcpkg.json

Author: Netdex

.gitattributes

@@ -0,0 +1 @@
+*.7z filter=lfs diff=lfs merge=lfs -text

.github/workflows/rust.yaml

@@ -0,0 +1,38 @@
+name: Rust
+
+on:
+  push:
+    branches: ["master"]
+  pull_request:
+    branches: ["master"]
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
+      VCPKG_INSTALLED_DIR: ${{ github.workspace }}/third-party/vcpkg/installed
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          lfs: true
+          submodules: recursive
+      - name: Extract data
+        run: 7z x deploy/ichiran-250113.7z
+      - name: Setup vcpkg
+        uses: lukka/run-vcpkg@v11
+        with:
+          vcpkgDirectory: "${{ github.workspace }}/third-party/vcpkg"
+          runVcpkgInstall: true
+          vcpkgJsonGlob: "**/vcpkg.json"
+      - name: Build
+        run: cargo build --verbose
+      - name: Run tests
+        run: cargo test --verbose
+      - uses: actions/upload-artifact@v4
+        with:
+          name: niinii
+          path: target/release/niinii*

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "third-party/imgui-win32-sys/imgui"]
-	path = third-party/imgui-win32-sys/imgui
-	url = https://github.com/ocornut/imgui.git
+[submodule "third-party/vcpkg"]
+	path = third-party/vcpkg
+	url = https://github.com/Microsoft/vcpkg

Cargo.lock

@@ -14,14 +14,8 @@ imgui-winit-glow-renderer-viewports = { git = "https://github.com/Netdex/imgui-r
 # hudhook = { git = "https://github.com/veeenu/hudhook.git" }
 
 [workspace]
-members = [
-    "niinii",
-    "ichiran",
-    "openai-chat",
-    "third-party/eventsource-stream",
-    "third-party/imgui-dx11-renderer",
-    "third-party/vvcore",
-]
+members = ["niinii", "ichiran", "openai-chat"]
+exclude = ["third-party"]
 resolver = "2"
 
 # flate2 is slow in debug mode
@@ -30,4 +24,4 @@ opt-level = 3
 [profile.dev.package.miniz_oxide]
 opt-level = 3
 [profile.dev.package.adler2]
-opt-level = 3
+opt-level = 3

Cargo.toml

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7484b50a0d2412394d5a807c4d43cf2c4042dc814a9f59192106a452caf530be
+size 422191899

deploy/ichiran-250113.7z

@@ -38,6 +38,7 @@ winapi = { version = "0.3", features = [
 	"winuser",
 	"jobapi2",
 ] }
+win32job = "2.0.3"
 
 [dev-dependencies]
 tokio = { version = "1", features = ["rt", "macros"] }

ichiran/Cargo.toml

@@ -4,6 +4,7 @@ use std::{
 };
 
 use tokio::process::{Child, Command};
+use win32job::{Job, JobError};
 
 use crate::ConnParams;
 
@@ -12,6 +13,7 @@ pub struct PostgresDaemon {
     data_path: PathBuf,
     pg_proc: Result<Child, std::io::Error>,
     silent: bool,
+    _job_obj: Job,
 }
 impl PostgresDaemon {
     pub fn new(
@@ -23,6 +25,8 @@ impl PostgresDaemon {
         let pg_bin_dir = pg_bin_dir.into();
         let data_path = data_path.into();
 
+        let job = Self::create_job_object().expect("failed to create job object");
+
         tracing::info!(?pg_bin_dir, ?data_path, "starting");
         let postgres_bin_path = Self::pg_bin_path(&pg_bin_dir, "postgres");
 
@@ -51,13 +55,22 @@ impl PostgresDaemon {
             data_path,
             pg_proc: proc,
             silent,
+            _job_obj: job,
         }
     }
     fn pg_bin_path(pg_bin_dir: impl AsRef<Path>, name: impl Into<PathBuf>) -> PathBuf {
         let mut bin = name.into();
         bin.set_extension(std::env::consts::EXE_EXTENSION);
         pg_bin_dir.as_ref().join(bin)
     }
+    fn create_job_object() -> Result<Job, JobError> {
+        let job = Job::create()?;
+        let mut info = job.query_extended_limit_info()?;
+        info.limit_kill_on_job_close();
+        job.set_extended_limit_info(&info)?;
+        job.assign_current_process()?;
+        Ok(job)
+    }
 }
 impl Drop for PostgresDaemon {
     fn drop(&mut self) {

ichiran/src/pgdaemon.rs

@@ -140,6 +140,7 @@ mod tests {
     use crate::tests::fixture;
 
     #[tokio::test]
+    #[ignore]
     async fn test_match() {
         let ichiran = fixture::ichiran().await;
 

ichiran/src/protocol/kanji.rs

@@ -396,6 +396,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore]
     async fn test_match() {
         let ichiran = fixture::ichiran().await;
         let nikaime = ichiran.romanize("2回目", 1).await.unwrap();
@@ -431,6 +432,7 @@ mod tests {
     }
 
     #[tokio::test]
+    #[ignore]
     async fn test_romanize() {
         let ichiran = fixture::ichiran().await;
         let _furaseteiru = ichiran.romanize("降らせている", 1).await.unwrap();