From d9477c83720b8aaf216b18dbe1b2d37a14c5509a Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Thu, 27 Jun 2024 20:45:33 +0900 Subject: [PATCH 1/3] chore: change resolved to resolves --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 31a2ca4b..c20a6e7f 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,5 +1,5 @@ -resolved: #issue +resolves: #issue ## 설명 -간단하게 해당 PR이 어떤 내용인지 작성합니다. 이슈를 통해서 충분히 설명이 가능 하다고 생각하면 resolved만 작성하시면 됩 +간단하게 해당 PR이 어떤 내용인지 작성합니다. 이슈를 통해서 충분히 설명이 가능 하다고 생각하면 resolves만 작성하시면 됩 니다. From 8a5ecd8e432e7f46e4ded3d822fa8b6bd01b17c0 Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Thu, 27 Jun 2024 10:56:58 +0900 Subject: [PATCH 2/3] feat: add os matrix on PR test --- .github/workflows/pr_test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_test.yml b/.github/workflows/pr_test.yml index 075d6b17..3825ec14 100644 --- a/.github/workflows/pr_test.yml +++ b/.github/workflows/pr_test.yml @@ -9,11 +9,12 @@ env: jobs: build_and_test: name: Rust project - latest - runs-on: ubuntu-latest strategy: matrix: + os: [ubuntu-latest, macos-latest, windows-latest] toolchain: - stable + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v3 From 8cfc51803c6cc9ff43390decf7f32f3a12cc9cca Mon Sep 17 00:00:00 2001 From: Jiho Lee Date: Thu, 27 Jun 2024 20:00:00 +0900 Subject: [PATCH 3/3] fix: Use cfg covers target_os exactly windows, not other which not affects --- src/executor/initializer.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/executor/initializer.rs b/src/executor/initializer.rs index 7141b019..e1005db0 100644 --- a/src/executor/initializer.rs +++ b/src/executor/initializer.rs @@ -138,6 +138,11 @@ WantedBy=multi-user.target"#; self.write_and_check_err(base_path, script).await } + #[cfg(target_os = "windows")] + async fn create_daemon_config_if_not_exists(&self) -> Result<(), RRDBError> { + todo!(); + } + async fn write_and_check_err( &self, base_path: PathBuf, @@ -151,11 +156,6 @@ WantedBy=multi-user.target"#; Ok(()) } - #[cfg(other)] - async fn create_daemon_config_if_not_exists(&self) -> Result<(), RRDBError> { - todo!(); - } - async fn start_daemon(&self) -> Result<(), RRDBError> { let (program, args) = self.get_daemon_start_command(); let output = Command::new(program).args(args).output(); @@ -173,7 +173,7 @@ WantedBy=multi-user.target"#; ("launchctl", vec!["load", LAUNCHD_PLIST_PATH]) } - #[cfg(other)] + #[cfg(target_os = "windows")] fn get_daemon_start_command(&self) -> (&'static str, Vec<&'static str>) { todo!() }