From 29754ea2843d09863d5f56cf0e5f3bcb0c43a401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Cabrera?= Date: Mon, 6 Apr 2026 17:17:05 -0400 Subject: [PATCH 1/2] Set dev versions --- Cargo.lock | 6 +++--- crates/codegen/Cargo.toml | 2 +- crates/javy/Cargo.toml | 2 +- crates/plugin-api/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa2114ab..ca4920f6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1653,7 +1653,7 @@ dependencies = [ [[package]] name = "javy" -version = "7.0.0" +version = "7.0.0-alpha.1" dependencies = [ "anyhow", "bitflags", @@ -1692,7 +1692,7 @@ dependencies = [ [[package]] name = "javy-codegen" -version = "4.0.0" +version = "4.0.0-alpha.1" dependencies = [ "anyhow", "brotli", @@ -1735,7 +1735,7 @@ dependencies = [ [[package]] name = "javy-plugin-api" -version = "6.0.0" +version = "6.0.0-alpha.1" dependencies = [ "anyhow", "javy", diff --git a/crates/codegen/Cargo.toml b/crates/codegen/Cargo.toml index 5fa8b4ef..78089c4c 100644 --- a/crates/codegen/Cargo.toml +++ b/crates/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy-codegen" -version = "4.0.0" +version = "4.0.0-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/crates/javy/Cargo.toml b/crates/javy/Cargo.toml index 8e1d5cf5..d202933b 100644 --- a/crates/javy/Cargo.toml +++ b/crates/javy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy" -version = "7.0.0" +version = "7.0.0-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/crates/plugin-api/Cargo.toml b/crates/plugin-api/Cargo.toml index d7dbc352..9877f65d 100644 --- a/crates/plugin-api/Cargo.toml +++ b/crates/plugin-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy-plugin-api" -version = "6.0.0" +version = "6.0.0-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true From 01965c1a5ee574a994e6e9a612dbee7db224c9ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Cabrera?= Date: Mon, 13 Apr 2026 12:23:18 -0400 Subject: [PATCH 2/2] javy-release: Ensure that patch is bumped When running `set-dev-versions` --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- crates/codegen/Cargo.toml | 2 +- crates/javy/Cargo.toml | 2 +- crates/plugin-api/Cargo.toml | 2 +- release/src/lib.rs | 12 +++++++++++- release/tests/integration_test.rs | 2 +- 7 files changed, 19 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ca4920f6..b45d2259 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1653,7 +1653,7 @@ dependencies = [ [[package]] name = "javy" -version = "7.0.0-alpha.1" +version = "7.0.1-alpha.1" dependencies = [ "anyhow", "bitflags", @@ -1692,7 +1692,7 @@ dependencies = [ [[package]] name = "javy-codegen" -version = "4.0.0-alpha.1" +version = "4.0.1-alpha.1" dependencies = [ "anyhow", "brotli", @@ -1735,7 +1735,7 @@ dependencies = [ [[package]] name = "javy-plugin-api" -version = "6.0.0-alpha.1" +version = "6.0.1-alpha.1" dependencies = [ "anyhow", "javy", diff --git a/Cargo.toml b/Cargo.toml index 828f8c47..14d37b1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ wasmtime-wasi = "43" wasmtime-wizer = "43" wasm-opt = "0.116.1" anyhow = "1.0" -javy = { path = "crates/javy", version = "7.0.0-alpha.1" } +javy = { path = "crates/javy", version = "7.0.1-alpha.1" } tempfile = "3.27.0" tokio = "1" uuid = { version = "1.23", features = ["v4"] } diff --git a/crates/codegen/Cargo.toml b/crates/codegen/Cargo.toml index 78089c4c..e0b05175 100644 --- a/crates/codegen/Cargo.toml +++ b/crates/codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy-codegen" -version = "4.0.0-alpha.1" +version = "4.0.1-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/crates/javy/Cargo.toml b/crates/javy/Cargo.toml index d202933b..2253d114 100644 --- a/crates/javy/Cargo.toml +++ b/crates/javy/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy" -version = "7.0.0-alpha.1" +version = "7.0.1-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/crates/plugin-api/Cargo.toml b/crates/plugin-api/Cargo.toml index 9877f65d..5890b64d 100644 --- a/crates/plugin-api/Cargo.toml +++ b/crates/plugin-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "javy-plugin-api" -version = "6.0.0-alpha.1" +version = "6.0.1-alpha.1" authors.workspace = true edition.workspace = true license.workspace = true diff --git a/release/src/lib.rs b/release/src/lib.rs index be13c789..7265d0cc 100644 --- a/release/src/lib.rs +++ b/release/src/lib.rs @@ -37,7 +37,8 @@ impl PublishableCrate { if let Some(version_item) = package.get("version") { if let Some(version_str) = version_item.as_str() { if !version_str.contains("-alpha") { - let new_version = format!("{}-alpha.1", version_str); + let new_version = bump_patch_and_add_alpha(version_str) + .unwrap_or_else(|| format!("{}-alpha.1", version_str)); package["version"] = value(&new_version); } } @@ -182,6 +183,15 @@ impl PublishableCrates { } } +fn bump_patch_and_add_alpha(version: &str) -> Option { + let parts: Vec<&str> = version.splitn(3, '.').collect(); + if parts.len() != 3 { + return None; + } + let patch: u64 = parts[2].parse().ok()?; + Some(format!("{}.{}.{}-alpha.1", parts[0], parts[1], patch + 1)) +} + fn is_publishable(doc: &DocumentMut) -> bool { match doc.get("package") { Some(p) => { diff --git a/release/tests/integration_test.rs b/release/tests/integration_test.rs index 50c3d3c9..94e44e36 100644 --- a/release/tests/integration_test.rs +++ b/release/tests/integration_test.rs @@ -56,7 +56,7 @@ fn test_set_dev_versions() -> Result<()> { let cargo_toml = fs::read_to_string(root.path().join("crates/test-crate/Cargo.toml"))?; - assert!(cargo_toml.contains(r#"version = "1.0.0-alpha.1""#)); + assert!(cargo_toml.contains(r#"version = "1.0.1-alpha.1""#)); Ok(()) }