feat: add ability to store different versions of plugin

.github/workflows/test.yml

@@ -2,9 +2,8 @@ name: Tests
 
 on:
   push:
-    branches:
-      - master
   pull_request:
+    types: [opened, reopened]
 
 jobs:
   pre_job:

Cargo.toml

@@ -46,4 +46,5 @@ name = "cargo-pike"
 path = "src/main.rs"
 
 [dev-dependencies]
-constcat = "0.6.0"
+toml_edit = "0.22.23"
+constcat = "0.5.1"

README.md

@@ -248,6 +248,7 @@ cargo pike plugin build
 #### Доступные опции
 
 - `--release` - Сборка release-версии плагина
+- `--target-dir <TARGET_DIR>` - Директория собранных бинарных файлов. Значение по умолчанию: `target`
 
 ### `config apply`
 

plugin_template/_Cargo.toml

@@ -10,11 +10,11 @@ serde = { version = "1", features = ["derive"] }
 log = "0.4"
 
 [dev-dependencies]
-picodata-pike = { git = "https://github.com/picodata/pike.git", branch = "daemon_v2" } # TODO: change after publish on crates.io
+picodata-pike = { git = "https://github.com/picodata/pike.git", branch = "more_versions" } # TODO: change after publish on crates.io
 reqwest = { version = "0.12", features = ["blocking"] }
 
 [build-dependencies]
-picodata-pike = { git = "https://github.com/picodata/pike.git", branch = "daemon_v2" } # TODO: change after publish on crates.io
+picodata-pike = { git = "https://github.com/picodata/pike.git", branch = "more_versions" } # TODO: change after publish on crates.io
 liquid = "0.26"
 fs_extra = "1"
 

src/commands/lib.rs

@@ -1,5 +1,6 @@
 use anyhow::{bail, Context, Result};
 use std::io::{BufRead, BufReader, Read};
+use std::path::PathBuf;
 use std::process::{Command, Stdio};
 
 pub enum BuildType {
@@ -8,14 +9,16 @@ pub enum BuildType {
 }
 
 #[allow(clippy::needless_pass_by_value)]
-pub fn cargo_build(build_type: BuildType) -> Result<()> {
+pub fn cargo_build(build_type: BuildType, target_dir: &PathBuf) -> Result<()> {
     let mut args = vec!["build"];
     if let BuildType::Release = build_type {
         args.push("--release");
     }
 
     let mut child = Command::new("cargo")
         .args(args)
+        .arg("--target-dir")
+        .args(target_dir)
         .stdout(Stdio::piped())
         .spawn()
         .context("running cargo build")?;

src/commands/plugin/build.rs

@@ -1,13 +1,15 @@
+use std::path::PathBuf;
+
 use anyhow::{Context, Result};
 use lib::{cargo_build, BuildType};
 
 use crate::commands::lib;
 
-pub fn cmd(release: bool) -> Result<()> {
+pub fn cmd(release: bool, target_dir: &PathBuf) -> Result<()> {
     let build_type = if release {
         BuildType::Release
     } else {
         BuildType::Debug
     };
-    cargo_build(build_type).context("building of plugin")
+    cargo_build(build_type, target_dir).context("building of plugin")
 }

src/commands/plugin/pack.rs

@@ -5,7 +5,7 @@ use lib::{cargo_build, BuildType};
 use serde::Deserialize;
 use std::fs::File;
 use std::io::{BufRead, BufReader};
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::{env, fs};
 use tar::Builder;
 
@@ -28,7 +28,7 @@ const LIB_EXT: &str = "so";
 #[cfg(target_os = "macos")]
 const LIB_EXT: &str = "dylib";
 
-pub fn cmd(pack_debug: bool, target_dir: &Path) -> Result<()> {
+pub fn cmd(pack_debug: bool, target_dir: &PathBuf) -> Result<()> {
     let root_dir = env::current_dir()?;
     let plugin_name = &root_dir
         .file_name()
@@ -37,10 +37,10 @@ pub fn cmd(pack_debug: bool, target_dir: &Path) -> Result<()> {
         .context("parsing filename to string")?;
 
     let build_dir = if pack_debug {
-        cargo_build(BuildType::Debug).context("building release version of plugin")?;
+        cargo_build(BuildType::Debug, target_dir).context("building release version of plugin")?;
         Path::new(&root_dir).join(target_dir).join("debug")
     } else {
-        cargo_build(BuildType::Release).context("building debug version of plugin")?;
+        cargo_build(BuildType::Release, target_dir).context("building debug version of plugin")?;
         Path::new(&root_dir).join(target_dir).join("release")
     };
 

src/commands/run.rs

@@ -395,10 +395,10 @@ pub fn cluster(params: &Params) -> Result<Vec<PicodataInstance>> {
     ))?;
 
     let plugins_dir = if params.use_release {
-        cargo_build(lib::BuildType::Release)?;
+        cargo_build(lib::BuildType::Release, &params.target_dir)?;
         params.target_dir.join("release")
     } else {
-        cargo_build(lib::BuildType::Debug)?;
+        cargo_build(lib::BuildType::Debug, &params.target_dir)?;
         params.target_dir.join("debug")
     };