diff --git a/.run_status.toml b/.run_status.toml index b7db2d6..ab1db7e 100644 --- a/.run_status.toml +++ b/.run_status.toml @@ -5,7 +5,7 @@ coverage = 92.72 [last_run_clean.run_duration] secs = 62 -nanos = 709259686 +nanos = 51839113 [last_run_incremental] run_status = "Success" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6764b69..0a99df4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ All notable changes to John Slop are recorded here. The format follows ## [Unreleased] +## [0.1.27-rc.6] - 2026-09-30 + +### Fixed + +- Published cargo-binstall `.tgz` archives alongside raw binaries so the + package metadata added in RC5 resolves to release assets. + ## [0.1.27-rc.5] - 2026-09-30 ### Added @@ -190,7 +197,8 @@ All notable changes to John Slop are recorded here. The format follows - Stdio LSP replacement diagnostics and versioned quick fixes. - Runnable examples, reviewed fixtures, fuzz targets, benchmarks, and CI gates. -[Unreleased]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.5...HEAD +[Unreleased]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.6...HEAD +[0.1.27-rc.6]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.5...v0.1.27-rc.6 [0.1.27-rc.5]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.4...v0.1.27-rc.5 [0.1.27-rc.4]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.3...v0.1.27-rc.4 [0.1.27-rc.3]: https://proxy.dandaedre.com/gitea/idle-org/john-slop/compare/v0.1.27-rc.2...v0.1.27-rc.3 diff --git a/Cargo.lock b/Cargo.lock index aeb1bbd..55927b1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -699,7 +699,7 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" [[package]] name = "john-slop" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "clap", "criterion", @@ -724,7 +724,7 @@ dependencies = [ [[package]] name = "john-slop-core" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "directories", "figment", @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "john-slop-lsp" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "john-slop-core", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 3e2b32b..4f0b805 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,7 +4,7 @@ default-members = [".", "crates/john-slop-core", "crates/john-slop-lsp"] resolver = "3" [workspace.package] -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" edition = "2024" rust-version = "1.98.1" license = "MIT" @@ -18,8 +18,8 @@ figment = { version = "0.10.19", default-features = false, features = ["toml"] } futures = { version = "0.3.34", default-features = false, features = ["std"] } globset = { version = "0.4.20", default-features = false } insta = { version = "1.48.0", default-features = false } -john-slop-core = { version = "0.1.27-rc.5", path = "crates/john-slop-core" } -john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.27-rc.5", path = "crates/john-slop-lsp" } +john-slop-core = { version = "0.1.27-rc.6", path = "crates/john-slop-core" } +john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.27-rc.6", path = "crates/john-slop-lsp" } miette = { version = "7.6.0", default-features = false, features = ["derive"] } regex = "1.13.1" serde = { version = "1.0.229", features = ["derive"] } diff --git a/badges/version.svg b/badges/version.svg index a64e9aa..a778f7c 100644 --- a/badges/version.svg +++ b/badges/version.svg @@ -1 +1 @@ -version: 0.1.27-rc.5version0.1.27-rc.5 \ No newline at end of file +version: 0.1.27-rc.6version0.1.27-rc.6 \ No newline at end of file diff --git a/docs/releasing.md b/docs/releasing.md index b6d267b..b080439 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -52,10 +52,11 @@ then pass the path of a readable Gitea token file to the repository wrapper: The wrapper keeps the token out of command-line arguments, exports it as `GITEA_TOKEN` only to `rust_realease`, selects the `john-slop` workspace package, -and publishes raw binary artifacts. It temporarily selects the canonical HTTPS +and publishes cargo-binstall archives alongside raw binary artifacts. It +temporarily selects the canonical HTTPS origin for publication, then restores the SSH development origin after both successful and failed attempts. A hyphenated Cargo version such as -`0.1.27-rc.5` automatically marks the Gitea release as a prerelease. Additional +`0.1.27-rc.6` automatically marks the Gitea release as a prerelease. Additional arguments are forwarded, so use `--dry-run` before publication and `--replace-assets` only after reviewing an existing release collision. The checkout must be clean and its local and remote `vX.Y.Z` tag must match the diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index e098605..8b08175 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -385,7 +385,7 @@ dependencies = [ [[package]] name = "john-slop-core" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "directories", "figment", @@ -411,7 +411,7 @@ dependencies = [ [[package]] name = "john-slop-lsp" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "john-slop-core", "serde_json", @@ -422,7 +422,7 @@ dependencies = [ [[package]] name = "john-slop" -version = "0.1.27-rc.5" +version = "0.1.27-rc.6" dependencies = [ "clap", "globset", diff --git a/release.sh b/release.sh index c3692f0..8f2868e 100755 --- a/release.sh +++ b/release.sh @@ -60,7 +60,7 @@ trap 'exit 143' 15 set -- \ "$repository_dir" \ --package john-slop \ - --artifact-format binary \ + --artifact-format both \ "$@" case "$manifest_version" in *-*) set -- "$@" --prerelease ;; diff --git a/tasks.md b/tasks.md index 40e4203..22f595c 100644 --- a/tasks.md +++ b/tasks.md @@ -825,6 +825,23 @@ dependency policy, package assembly, exact binary versions, and 92.72% clean coverage passed. Earlier RC tags remain unchanged before RC5 is tagged and published. +## Release candidate 0.1.27-rc.6 + +- [x] Publish cargo-binstall `.tgz` archives alongside raw binaries and pin the + wrapper argument contract in its integration test. +- [x] Synchronize and verify release artifacts at `0.1.27-rc.6`, then publish + immutable prerelease `v0.1.27-rc.6` without moving earlier RC tags. + +Acceptance: the publisher receives artifact format `both`; the release contains +the target archives named by `package.metadata.binstall`; cargo-binstall +installation verification passes; and all standard release gates remain green. + +Accepted on 2026-09-30: the wrapper contract passes artifact format `both` and +prerelease mode; formatting, Clippy, both feature test matrices, documentation, +MSRV, RustSec, dependency policy, package assembly, exact binary versions, and +92.72% clean coverage passed. Earlier RC tags remain unchanged before RC6 is +tagged and published. + ## Deferred by design - Statistical or model-based authorship classification. diff --git a/tests/fixtures/evaluation/signoff.toml b/tests/fixtures/evaluation/signoff.toml index 78a33fe..9e8033d 100644 --- a/tests/fixtures/evaluation/signoff.toml +++ b/tests/fixtures/evaluation/signoff.toml @@ -1,5 +1,5 @@ schema_version = 1 -release = "0.1.27-rc.5" +release = "0.1.27-rc.6" reviewed_on = "2026-09-30" status = "accepted-with-runtime-catalog-boundary" catalog_sha256 = "da34ce00dfd2d801e772fa440d932abb98c929f5ad08ff3ad5e47e0ed4d84d5a" diff --git a/tests/release_wrapper.rs b/tests/release_wrapper.rs index c1c8a84..e3ad642 100644 --- a/tests/release_wrapper.rs +++ b/tests/release_wrapper.rs @@ -39,7 +39,7 @@ fn release_wrapper_uses_https_then_restores_ssh_on_every_exit() { .expect("release wrapper should be copied"); fs::write( repository.join("Cargo.toml"), - "[package]\nname = \"john-slop\"\nversion = \"0.1.27-rc.5\"\n", + "[package]\nname = \"john-slop\"\nversion = \"0.1.27-rc.6\"\n", ) .expect("manifest should be written"); fs::write(repository.join("token.txt"), "test-token\n") @@ -51,6 +51,7 @@ fn release_wrapper_uses_https_then_restores_ssh_on_every_exit() { "#!/bin/sh\n\ [ \"$GITEA_TOKEN\" = test-token ] || exit 91\n\ git -C \"$1\" remote get-url origin >\"$OBSERVED_ORIGIN\"\n\ + printf '%s\\n' \"$@\" >\"$OBSERVED_ARGS\"\n\ exit \"$FAKE_RELEASE_STATUS\"\n", ) .expect("fake release executable should be written"); @@ -72,6 +73,7 @@ fn release_wrapper_uses_https_then_restores_ssh_on_every_exit() { ); let observed_origin = temporary.path().join("observed-origin.txt"); + let observed_args = temporary.path().join("observed-args.txt"); let path = format!( "{}:{}", fake_bin.display(), @@ -82,6 +84,7 @@ fn release_wrapper_uses_https_then_restores_ssh_on_every_exit() { .arg("--dry-run") .env("PATH", path) .env("OBSERVED_ORIGIN", &observed_origin) + .env("OBSERVED_ARGS", &observed_args) .env("FAKE_RELEASE_STATUS", release_status.to_string())); assert_eq!(output.status.code(), Some(release_status)); @@ -97,5 +100,9 @@ fn release_wrapper_uses_https_then_restores_ssh_on_every_exit() { .trim(), DEVELOPMENT_ORIGIN ); + let arguments = fs::read_to_string(&observed_args) + .expect("fake release should record publisher arguments"); + assert!(arguments.lines().any(|argument| argument == "both")); + assert!(arguments.lines().any(|argument| argument == "--prerelease")); } }