From a879d87314116559088712c29924823aadf7926f Mon Sep 17 00:00:00 2001 From: Lucas Nogueira Date: Wed, 29 May 2024 08:07:55 -0300 Subject: [PATCH] fix(ci): v1 release-plz --- .github/workflows/release-plz.yml | 2 +- crates/{devtools-v1 => v1}/Cargo.lock | 0 crates/v1/Cargo.toml | 3 +++ crates/{devtools-v1 => v1/crates/devtools}/Cargo.toml | 2 +- crates/{devtools-v1 => v1/crates/devtools}/README.md | 0 crates/{devtools-v1 => v1/crates/devtools}/src/lib.rs | 0 crates/{devtools-v1 => v1/crates/devtools}/src/server.rs | 0 examples/tauri-v1/Cargo.toml | 2 +- 8 files changed, 6 insertions(+), 3 deletions(-) rename crates/{devtools-v1 => v1}/Cargo.lock (100%) create mode 100644 crates/v1/Cargo.toml rename crates/{devtools-v1 => v1/crates/devtools}/Cargo.toml (91%) rename crates/{devtools-v1 => v1/crates/devtools}/README.md (100%) rename crates/{devtools-v1 => v1/crates/devtools}/src/lib.rs (100%) rename crates/{devtools-v1 => v1/crates/devtools}/src/server.rs (100%) diff --git a/.github/workflows/release-plz.yml b/.github/workflows/release-plz.yml index 5141d6d4..b9fde389 100644 --- a/.github/workflows/release-plz.yml +++ b/.github/workflows/release-plz.yml @@ -39,7 +39,7 @@ jobs: - name: Run release-plz (devtools for Tauri v1) uses: MarcoIeni/release-plz-action@v0.5 with: - project_manifest: crates/devtools-v1/Cargo.toml + project_manifest: crates/v1/crates/devtools/Cargo.toml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }} \ No newline at end of file diff --git a/crates/devtools-v1/Cargo.lock b/crates/v1/Cargo.lock similarity index 100% rename from crates/devtools-v1/Cargo.lock rename to crates/v1/Cargo.lock diff --git a/crates/v1/Cargo.toml b/crates/v1/Cargo.toml new file mode 100644 index 00000000..a848b85b --- /dev/null +++ b/crates/v1/Cargo.toml @@ -0,0 +1,3 @@ +[workspace] +resolver = "2" +members = ["crates/*"] diff --git a/crates/devtools-v1/Cargo.toml b/crates/v1/crates/devtools/Cargo.toml similarity index 91% rename from crates/devtools-v1/Cargo.toml rename to crates/v1/crates/devtools/Cargo.toml index 4d0a9e4f..6a8f9d78 100644 --- a/crates/devtools-v1/Cargo.toml +++ b/crates/v1/crates/devtools/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/crabnebula-dev/devtools" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -devtools-core = { path = "../devtools-core", version = "0.3.0" } +devtools-core = { path = "../../../devtools-core", version = "0.3.0" } tauri = { version = "1.6.1", features = ["tracing"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/crates/devtools-v1/README.md b/crates/v1/crates/devtools/README.md similarity index 100% rename from crates/devtools-v1/README.md rename to crates/v1/crates/devtools/README.md diff --git a/crates/devtools-v1/src/lib.rs b/crates/v1/crates/devtools/src/lib.rs similarity index 100% rename from crates/devtools-v1/src/lib.rs rename to crates/v1/crates/devtools/src/lib.rs diff --git a/crates/devtools-v1/src/server.rs b/crates/v1/crates/devtools/src/server.rs similarity index 100% rename from crates/devtools-v1/src/server.rs rename to crates/v1/crates/devtools/src/server.rs diff --git a/examples/tauri-v1/Cargo.toml b/examples/tauri-v1/Cargo.toml index 06131486..2293f039 100644 --- a/examples/tauri-v1/Cargo.toml +++ b/examples/tauri-v1/Cargo.toml @@ -10,7 +10,7 @@ path = "main.rs" [dependencies] tauri = "1.6.1" -devtools = { path = "../../crates/devtools-v1" } +devtools = { path = "../../crates/v1/crates/devtools" } tracing = "0.1" tokio = { version = "1.36", features = ["time"] } reqwest = "0.11"