From e74b7281bed68caf0746c0ab60e9dc9930c742c3 Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Wed, 20 May 2026 15:45:35 -0700 Subject: [PATCH 1/6] fix: use simple release-please strategy --- release-please-config.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release-please-config.json b/release-please-config.json index efc52f3..ec79594 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", - "release-type": "rust", + "release-type": "simple", "bootstrap-sha": "b8a67c26adecb5036130d5e67af3aec5f98109b9", "include-component-in-tag": false, "packages": { @@ -8,6 +8,11 @@ "package-name": "adhd-ranch", "changelog-path": "CHANGELOG.md", "extra-files": [ + { + "type": "toml", + "path": "Cargo.toml", + "jsonpath": "$.workspace.package.version" + }, { "type": "json", "path": "package.json", From 756561b2640b68e8a55657c0f14fe2b527c5df01 Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Wed, 20 May 2026 15:46:36 -0700 Subject: [PATCH 2/6] fix: use node release-please strategy --- release-please-config.json | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/release-please-config.json b/release-please-config.json index ec79594..1bffe4b 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", - "release-type": "simple", + "release-type": "node", "bootstrap-sha": "b8a67c26adecb5036130d5e67af3aec5f98109b9", "include-component-in-tag": false, "packages": { @@ -13,21 +13,6 @@ "path": "Cargo.toml", "jsonpath": "$.workspace.package.version" }, - { - "type": "json", - "path": "package.json", - "jsonpath": "$.version" - }, - { - "type": "json", - "path": "package-lock.json", - "jsonpath": "$.version" - }, - { - "type": "json", - "path": "package-lock.json", - "jsonpath": "$.packages[''].version" - }, { "type": "json", "path": "src-tauri/tauri.conf.json", From 1bf6476f0a1cfdfafe341622c1108e3bbb47f439 Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Wed, 20 May 2026 15:47:14 -0700 Subject: [PATCH 3/6] fix: update cargo lock versions in release PRs --- release-please-config.json | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/release-please-config.json b/release-please-config.json index 1bffe4b..c15abbd 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -13,6 +13,31 @@ "path": "Cargo.toml", "jsonpath": "$.workspace.package.version" }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[?(@.name=='adhd-ranch')].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[?(@.name=='adhd-ranch-commands')].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[?(@.name=='adhd-ranch-domain')].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[?(@.name=='adhd-ranch-http-api')].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[?(@.name=='adhd-ranch-storage')].version" + }, { "type": "json", "path": "src-tauri/tauri.conf.json", From 5f4230e089972f028f9bd5f21c45d8b2616218de Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Thu, 21 May 2026 08:33:15 -0700 Subject: [PATCH 4/6] fix: use explicit crate versions for release-please --- Cargo.toml | 1 - crates/commands/Cargo.toml | 2 +- crates/domain/Cargo.toml | 2 +- crates/http-api/Cargo.toml | 2 +- crates/storage/Cargo.toml | 2 +- release-please-config.json | 35 ++++++++++------------------------- src-tauri/Cargo.toml | 2 +- 7 files changed, 15 insertions(+), 31 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 24cd923..fa3fae8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,6 @@ members = [ ] [workspace.package] -version = "0.0.0" edition = "2021" rust-version = "1.77" diff --git a/crates/commands/Cargo.toml b/crates/commands/Cargo.toml index e4176ed..afe2647 100644 --- a/crates/commands/Cargo.toml +++ b/crates/commands/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adhd-ranch-commands" -version.workspace = true +version = "0.0.0" edition.workspace = true rust-version.workspace = true diff --git a/crates/domain/Cargo.toml b/crates/domain/Cargo.toml index 65c7f55..f919074 100644 --- a/crates/domain/Cargo.toml +++ b/crates/domain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adhd-ranch-domain" -version.workspace = true +version = "0.0.0" edition.workspace = true rust-version.workspace = true diff --git a/crates/http-api/Cargo.toml b/crates/http-api/Cargo.toml index 7664760..cfc75ac 100644 --- a/crates/http-api/Cargo.toml +++ b/crates/http-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adhd-ranch-http-api" -version.workspace = true +version = "0.0.0" edition.workspace = true rust-version.workspace = true diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 4ce7489..8e636c8 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adhd-ranch-storage" -version.workspace = true +version = "0.0.0" edition.workspace = true rust-version.workspace = true diff --git a/release-please-config.json b/release-please-config.json index c15abbd..efc52f3 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", - "release-type": "node", + "release-type": "rust", "bootstrap-sha": "b8a67c26adecb5036130d5e67af3aec5f98109b9", "include-component-in-tag": false, "packages": { @@ -9,34 +9,19 @@ "changelog-path": "CHANGELOG.md", "extra-files": [ { - "type": "toml", - "path": "Cargo.toml", - "jsonpath": "$.workspace.package.version" - }, - { - "type": "toml", - "path": "Cargo.lock", - "jsonpath": "$.package[?(@.name=='adhd-ranch')].version" - }, - { - "type": "toml", - "path": "Cargo.lock", - "jsonpath": "$.package[?(@.name=='adhd-ranch-commands')].version" - }, - { - "type": "toml", - "path": "Cargo.lock", - "jsonpath": "$.package[?(@.name=='adhd-ranch-domain')].version" + "type": "json", + "path": "package.json", + "jsonpath": "$.version" }, { - "type": "toml", - "path": "Cargo.lock", - "jsonpath": "$.package[?(@.name=='adhd-ranch-http-api')].version" + "type": "json", + "path": "package-lock.json", + "jsonpath": "$.version" }, { - "type": "toml", - "path": "Cargo.lock", - "jsonpath": "$.package[?(@.name=='adhd-ranch-storage')].version" + "type": "json", + "path": "package-lock.json", + "jsonpath": "$.packages[''].version" }, { "type": "json", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index d64a48e..1ad3dd3 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "adhd-ranch" -version.workspace = true +version = "0.0.0" edition.workspace = true rust-version.workspace = true description = "Issue tracking for a five-year-old" From 913298a16360e110d6091dbb3197f9fb7896eadf Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Thu, 21 May 2026 08:34:36 -0700 Subject: [PATCH 5/6] fix: use node strategy with rust version files --- Cargo.lock | 10 +++++----- release-please-config.json | 31 ++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e82e60c..de143b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "adhd-ranch" -version = "0.0.0" +version = "0.0.0" # x-release-please-version dependencies = [ "adhd-ranch-commands", "adhd-ranch-domain", @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "adhd-ranch-commands" -version = "0.0.0" +version = "0.0.0" # x-release-please-version dependencies = [ "adhd-ranch-domain", "adhd-ranch-storage", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "adhd-ranch-domain" -version = "0.0.0" +version = "0.0.0" # x-release-please-version dependencies = [ "serde", "serde_json", @@ -49,7 +49,7 @@ dependencies = [ [[package]] name = "adhd-ranch-http-api" -version = "0.0.0" +version = "0.0.0" # x-release-please-version dependencies = [ "adhd-ranch-commands", "adhd-ranch-domain", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "adhd-ranch-storage" -version = "0.0.0" +version = "0.0.0" # x-release-please-version dependencies = [ "adhd-ranch-domain", "fs2", diff --git a/release-please-config.json b/release-please-config.json index efc52f3..2a39310 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json", - "release-type": "rust", + "release-type": "node", "bootstrap-sha": "b8a67c26adecb5036130d5e67af3aec5f98109b9", "include-component-in-tag": false, "packages": { @@ -8,6 +8,35 @@ "package-name": "adhd-ranch", "changelog-path": "CHANGELOG.md", "extra-files": [ + { + "type": "toml", + "path": "src-tauri/Cargo.toml", + "jsonpath": "$.package.version" + }, + { + "type": "toml", + "path": "crates/domain/Cargo.toml", + "jsonpath": "$.package.version" + }, + { + "type": "toml", + "path": "crates/storage/Cargo.toml", + "jsonpath": "$.package.version" + }, + { + "type": "toml", + "path": "crates/commands/Cargo.toml", + "jsonpath": "$.package.version" + }, + { + "type": "toml", + "path": "crates/http-api/Cargo.toml", + "jsonpath": "$.package.version" + }, + { + "type": "generic", + "path": "Cargo.lock" + }, { "type": "json", "path": "package.json", From 88fe6301c0fb6ae115ba809ece031af7bb248466 Mon Sep 17 00:00:00 2001 From: archae0pteryx Date: Thu, 21 May 2026 08:36:12 -0700 Subject: [PATCH 6/6] fix: update cargo lock via toml paths --- Cargo.lock | 10 +++++----- release-please-config.json | 25 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de143b9..e82e60c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,7 +4,7 @@ version = 3 [[package]] name = "adhd-ranch" -version = "0.0.0" # x-release-please-version +version = "0.0.0" dependencies = [ "adhd-ranch-commands", "adhd-ranch-domain", @@ -29,7 +29,7 @@ dependencies = [ [[package]] name = "adhd-ranch-commands" -version = "0.0.0" # x-release-please-version +version = "0.0.0" dependencies = [ "adhd-ranch-domain", "adhd-ranch-storage", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "adhd-ranch-domain" -version = "0.0.0" # x-release-please-version +version = "0.0.0" dependencies = [ "serde", "serde_json", @@ -49,7 +49,7 @@ dependencies = [ [[package]] name = "adhd-ranch-http-api" -version = "0.0.0" # x-release-please-version +version = "0.0.0" dependencies = [ "adhd-ranch-commands", "adhd-ranch-domain", @@ -67,7 +67,7 @@ dependencies = [ [[package]] name = "adhd-ranch-storage" -version = "0.0.0" # x-release-please-version +version = "0.0.0" dependencies = [ "adhd-ranch-domain", "fs2", diff --git a/release-please-config.json b/release-please-config.json index 2a39310..8b1cc3b 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -34,8 +34,29 @@ "jsonpath": "$.package.version" }, { - "type": "generic", - "path": "Cargo.lock" + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[0].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[1].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[2].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[3].version" + }, + { + "type": "toml", + "path": "Cargo.lock", + "jsonpath": "$.package[4].version" }, { "type": "json",