From 073fdac17b1c56ed1eeaed17a2925d8bbd98ba76 Mon Sep 17 00:00:00 2001 From: jdx <216188+jdx@users.noreply.github.com> Date: Tue, 30 Dec 2025 10:01:49 -0800 Subject: [PATCH 1/2] fix(release): sync subcrate versions and use YYYY.MM.0 calver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The independent subcrate versioning feature (#7402) had two issues: 1. No initial tags were created for existing published versions, causing `has_crate_changes()` to always detect changes and attempt republishing 2. The calver bump logic was complex and could produce versions that already exist on crates.io (e.g., bumping 2025.10.0 -> 2025.11.0 when 2025.11.0 was already published) This fix: - Updates subcrate Cargo.toml versions to match crates.io (2025.12.12) - Simplifies calver to use YYYY.MM.0 for first release of each month - Tags vfox-v2025.12.12 and aqua-registry-v2025.12.12 were pushed separately 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- crates/aqua-registry/Cargo.toml | 2 +- crates/vfox/Cargo.toml | 2 +- xtasks/release-plz | 15 ++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/crates/aqua-registry/Cargo.toml b/crates/aqua-registry/Cargo.toml index 476baca432..3e93124581 100644 --- a/crates/aqua-registry/Cargo.toml +++ b/crates/aqua-registry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "aqua-registry" -version = "2025.10.0" +version = "2025.12.12" edition = "2024" description = "Aqua registry backend for mise" authors = ["Jeff Dickey (@jdx)"] diff --git a/crates/vfox/Cargo.toml b/crates/vfox/Cargo.toml index be90cdccfd..1f4a7493cd 100644 --- a/crates/vfox/Cargo.toml +++ b/crates/vfox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "vfox" -version = "2025.10.0" +version = "2025.12.12" edition = "2024" license = "MIT" description = "Interface to vfox plugins" diff --git a/xtasks/release-plz b/xtasks/release-plz index 8b3000d293..858b2efaf2 100755 --- a/xtasks/release-plz +++ b/xtasks/release-plz @@ -88,11 +88,11 @@ bump_subcrate_if_changed() { month="$(date +%-m)" if echo "$cur_version" | grep -qE "^$year\.$month\."; then + # Same year.month, bump patch (e.g., 2025.12.0 -> 2025.12.1) cargo set-version --bump patch -p "$crate_name" - elif echo "$cur_version" | grep -qE "^$year\."; then - cargo set-version --bump minor -p "$crate_name" else - cargo set-version "$year.1.0" -p "$crate_name" + # New month or new year, start fresh at YYYY.MM.0 + cargo set-version "$year.$month.0" -p "$crate_name" fi local new_version @@ -131,14 +131,11 @@ bump_and_publish_subcrate() { month="$(date +%-m)" if echo "$cur_version" | grep -qE "^$year\.$month\."; then - # Same year.month, bump patch + # Same year.month, bump patch (e.g., 2025.12.0 -> 2025.12.1) cargo set-version --bump patch -p "$crate_name" - elif echo "$cur_version" | grep -qE "^$year\."; then - # Same year, bump minor (month) - cargo set-version --bump minor -p "$crate_name" else - # New year - cargo set-version "$year.1.0" -p "$crate_name" + # New month or new year, start fresh at YYYY.MM.0 + cargo set-version "$year.$month.0" -p "$crate_name" fi local new_version From cad4356b4de8a468b100317081dc4dee5bc4f796 Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Tue, 30 Dec 2025 18:05:53 +0000 Subject: [PATCH 2/2] [autofix.ci] apply automated fixes --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a079e77b1b..fa08d6993c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -229,7 +229,7 @@ checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61" [[package]] name = "aqua-registry" -version = "2025.10.0" +version = "2025.12.12" dependencies = [ "expr-lang", "eyre", @@ -8038,7 +8038,7 @@ dependencies = [ [[package]] name = "vfox" -version = "2025.10.0" +version = "2025.12.12" dependencies = [ "clap", "env_logger",