Compare commits

...

8 Commits

Author SHA1 Message Date
Dandaedre f9c9a79797
chore: prepare 0.1.27-rc.1
Rust CI JohnSlop passed all CI checks.
Gitea/john_slop/pipeline/head This commit looks good Details
2026-09-30 19:00:23 +02:00
Dandaedre 5c2ff0dca9
build: add Gitea release wrapper
Rust CI JohnSlop passed all CI checks.
Gitea/john_slop/pipeline/head This commit looks good Details
2026-09-30 18:44:23 +02:00
Dandaedre dc21a5bf34
ci: remove obsolete coverage remnants
Rust CI JohnSlop passed all CI checks.
Gitea/john_slop/pipeline/head This commit looks good Details
2026-09-30 16:37:41 +02:00
Dandaedre f52f61f4c4
ci: disable unpublished coverage check 2026-09-30 16:33:25 +02:00
Dandaedre 6e4e27f774
ci: ignore legacy SBOM artifacts 2026-09-30 16:29:39 +02:00
Dandaedre f418f01216
build: replace yanked yoke derive
Rust CI JohnSlop failed CI.
Gitea/john_slop/pipeline/head There was a failure building this commit Details
2026-09-30 16:12:23 +02:00
Dandaedre d59a9dc471
build: remove SBOM generation
Rust CI JohnSlop failed CI.
Gitea/john_slop/pipeline/head There was a failure building this commit Details
2026-09-30 14:57:45 +02:00
Dandaedre 01d72c4600
ci: clean generated release artifacts 2026-09-30 14:51:56 +02:00
16 changed files with 165 additions and 66 deletions

3
.gitignore vendored
View File

@ -25,6 +25,9 @@ target/
# Generated locally by rust_autobadges/Cargo Tarpaulin
/tarpaulin-report.html
# Legacy cargo-cyclonedx intermediates may remain in reused CI workspaces.
**/sbom.cdx.json
# cargo-fuzz runtime output
/fuzz/artifacts/
/fuzz/coverage/

View File

@ -4,8 +4,8 @@ lines_parsed = 427
coverage = 92.72
[last_run_clean.run_duration]
secs = 60
nanos = 633592735
secs = 63
nanos = 130326201
[last_run_incremental]
run_status = "Success"

View File

@ -6,6 +6,24 @@ All notable changes to John Slop are recorded here. The format follows
## [Unreleased]
## [0.1.27-rc.1] - 2026-09-30
### Added
- Added a token-file wrapper around `rust_realease` for publishing tagged raw
binary release candidates without placing Gitea credentials in arguments.
### Changed
- Removed unused SBOM generation and unpublished Tarpaulin execution from the
Jenkins pipeline while retaining local coverage validation.
- Made reused Jenkins workspaces tolerate legacy generated release artifacts.
### Fixed
- Replaced the yanked transitive `yoke-derive 0.8.3` lockfile entry with
`0.8.4`.
## [0.1.26] - 2026-09-30
### Added
@ -140,7 +158,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://git.dandaedre.com/idle-org/john_slop/compare/v0.1.26...HEAD
[Unreleased]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.27-rc.1...HEAD
[0.1.27-rc.1]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.26...v0.1.27-rc.1
[0.1.26]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.25...v0.1.26
[0.1.25]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.24...v0.1.25
[0.1.24]: https://git.dandaedre.com/idle-org/john_slop/compare/v0.1.23...v0.1.24

10
Cargo.lock generated
View File

@ -699,7 +699,7 @@ checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
[[package]]
name = "john-slop-core"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"directories",
"figment",
@ -717,7 +717,7 @@ dependencies = [
[[package]]
name = "john-slop-lsp"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"john-slop-core",
"serde_json",
@ -728,7 +728,7 @@ dependencies = [
[[package]]
name = "john_slop"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"clap",
"criterion",
@ -1665,9 +1665,9 @@ dependencies = [
[[package]]
name = "yoke-derive"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33811428bee40dbceb6d545e95754741d17a6aef9a4849f0fd62e2ba4f412a78"
checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71"
dependencies = [
"proc-macro2",
"quote",

View File

@ -4,7 +4,7 @@ default-members = [".", "crates/john-slop-core", "crates/john-slop-lsp"]
resolver = "3"
[workspace.package]
version = "0.1.26"
version = "0.1.27-rc.1"
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.26", path = "crates/john-slop-core" }
john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.26", path = "crates/john-slop-lsp" }
john-slop-core = { version = "0.1.27-rc.1", path = "crates/john-slop-core" }
john-slop-lsp-engine = { package = "john-slop-lsp", version = "0.1.27-rc.1", 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"] }

33
Jenkinsfile vendored
View File

@ -8,10 +8,8 @@ pipeline {
CARGO_TERM_COLOR = 'always'
RUST_BACKTRACE = '1'
MSRV = '1.98.1'
TARPAULIN_VERSION = '0.37.4'
CARGO_AUDIT_VERSION = '0.22.2'
CARGO_DENY_VERSION = '0.20.2'
CARGO_CYCLONEDX_VERSION = '0.5.9'
}
stages {
@ -57,13 +55,6 @@ pipeline {
rustfmt --version
cargo clippy --version
INSTALLED_TARPAULIN="$(cargo tarpaulin --version 2>/dev/null || true)"
if [ "${INSTALLED_TARPAULIN}" != "cargo-tarpaulin-tarpaulin ${TARPAULIN_VERSION}" ]; then
cargo install cargo-tarpaulin \
--locked \
--version "${TARPAULIN_VERSION}"
fi
INSTALLED_AUDIT="$(cargo audit --version 2>/dev/null || true)"
if [ "${INSTALLED_AUDIT}" != "cargo-audit ${CARGO_AUDIT_VERSION}" ]; then
cargo install cargo-audit --locked --version "${CARGO_AUDIT_VERSION}"
@ -74,10 +65,6 @@ pipeline {
cargo install cargo-deny --locked --version "${CARGO_DENY_VERSION}"
fi
INSTALLED_CYCLONEDX="$(cargo cyclonedx --version 2>/dev/null || true)"
if [ "${INSTALLED_CYCLONEDX}" != "cargo-cyclonedx-cyclonedx ${CARGO_CYCLONEDX_VERSION}" ]; then
cargo install cargo-cyclonedx --locked --version "${CARGO_CYCLONEDX_VERSION}"
fi
'''
}
}
@ -165,18 +152,6 @@ pipeline {
}
}
stage('Coverage') {
steps {
sh '''
set -eu
echo "Measuring line coverage..."
cargo tarpaulin --config tarpaulin.toml
'''
}
}
stage('Clippy') {
steps {
sh '''
@ -234,6 +209,10 @@ pipeline {
echo "Building John Slop release binaries..."
# Jenkins reuses workspaces. Remove only ignored release
# output so rerunning the same commit stays deterministic.
rm -rf -- dist
# The packaging script reads and validates Cargo.toml itself.
scripts/package-release.sh
@ -257,7 +236,7 @@ pipeline {
conclusion: 'SUCCESS',
name: 'Rust CI',
summary: 'JohnSlop passed all CI checks.',
text: 'The Linux MSRV/stable matrix, formatting, feature tests, fixtures, docs, coverage, Clippy, supply-chain policy, and release build completed successfully.',
text: 'The Linux MSRV/stable matrix, formatting, feature tests, fixtures, docs, Clippy, supply-chain policy, and release build completed successfully.',
title: 'Build Successful'
)
@ -269,7 +248,7 @@ pipeline {
conclusion: 'FAILURE',
name: 'Rust CI',
summary: 'JohnSlop failed CI.',
text: 'A toolchain, formatting, test, fixture, documentation, coverage, Clippy, supply-chain, or release check failed. Check the Jenkins log.',
text: 'A toolchain, formatting, test, fixture, documentation, Clippy, supply-chain, or release check failed. Check the Jenkins log.',
title: 'Build Failed'
)

View File

@ -1 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="18" role="img" aria-label="version: 0.1.26"><title>version: 0.1.26</title><linearGradient id="bms-51cb0e88c02c82bd" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-51cb0e88c02c82bd"><rect width="96" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-51cb0e88c02c82bd)"><rect width="51" height="18" fill="#555"/><rect x="51" width="45" height="18" fill="#fe7d37"/><rect width="96" height="18" fill="url(#bms-51cb0e88c02c82bd)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="130" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="725" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="350">0.1.26</text><text x="725" y="130" transform="scale(.1)" fill="#fff" textLength="350">0.1.26</text></g></svg>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="124" height="18" role="img" aria-label="version: 0.1.27-rc.1"><title>version: 0.1.27-rc.1</title><linearGradient id="bms-f6e16d136190d727" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-color="#000" stop-opacity=".3"/><stop offset="1" stop-color="#000" stop-opacity=".5"/></linearGradient><clipPath id="bmr-f6e16d136190d727"><rect width="124" height="18" rx="4" fill="#fff"/></clipPath><g clip-path="url(#bmr-f6e16d136190d727)"><rect width="51" height="18" fill="#555"/><rect x="51" width="73" height="18" fill="#fe7d37"/><rect width="124" height="18" fill="url(#bms-f6e16d136190d727)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="265" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="410">version</text><text x="265" y="130" transform="scale(.1)" fill="#fff" textLength="410">version</text><text aria-hidden="true" x="865" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="630">0.1.27-rc.1</text><text x="865" y="130" transform="scale(.1)" fill="#fff" textLength="630">0.1.27-rc.1</text></g></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -53,6 +53,6 @@ points for day-to-day use.
expectations; [AGENTS.md](../AGENTS.md) defines repository-specific rules for
coding agents.
- [Release procedure](releasing.md) defines tagged reproducible packaging,
checksums, provenance, and CycloneDX SBOM generation.
checksums, and provenance metadata.
- [Implementation plan](../tasks.md) records completed milestones and deferred
product work.

View File

@ -58,5 +58,5 @@ abort-on-panic, symbol-stripped profile measures:
| `john-slop-lsp` | 4,756,688 |
These are build-specific engineering measurements, not promised download sizes.
The release procedure records final sizes and emits checksums and an SBOM beside
any distributed binaries.
The release procedure records final sizes and emits checksums beside any
distributed binaries.

View File

@ -80,8 +80,9 @@ rust_autobadges --high-coverage-percent 0.7 --mid-coverage-percent 0.3
```
Commit `badges/*.svg` and `.run_status.toml`; do not commit the generated
`tarpaulin-report.html`. Jenkins runs both feature configurations and enforces
the Tarpaulin floor before building release binaries.
`tarpaulin-report.html`. Coverage is currently a local release gate: Jenkins
runs both feature configurations, but its Tarpaulin check is disabled while the
job does not publish the report artifact.
## Test scope

View File

@ -17,19 +17,17 @@ the script without it to verify the registry-form dependency graph.
only after updating the manifest and lockfile.
2. Run normal Criterion sampling and the fuzz targets appropriate to changes.
3. Commit the release preparation and create signed or annotated tag `vX.Y.Z`.
4. Check out that tag and install the pinned SBOM tool:
4. Check out that tag and build the release archive:
```sh
cargo install cargo-cyclonedx --locked --version 0.5.9
scripts/package-release.sh X.Y.Z
```
5. Run the packaging command a second time in a fresh checkout with the same
Rust version and compare the archive SHA-256 digest.
6. Inspect `BUILD-INFO`, `SHA256SUMS`, the CycloneDX 1.5 JSON SBOM, binary help,
archive contents, and recorded sizes. Sign the archive and checksum if a
signing identity is available.
7. Publish the archive, archive checksum, SBOM, changelog excerpt, and signature
6. Inspect `BUILD-INFO`, `SHA256SUMS`, binary help, archive contents, and recorded
sizes. Sign the archive and checksum if a signing identity is available.
7. Publish the archive, archive checksum, changelog excerpt, and signature
together. Never publish an untagged or dirty build as a release.
`SOURCE_DATE_EPOCH` comes from the tagged commit. The release profile uses thin
@ -40,4 +38,23 @@ which must be recorded or controlled by the release environment.
The packaging smoke test produced byte-identical archives in two consecutive
runs on the Milestone 7 development host and validated both archive and internal
checksums plus the CycloneDX 1.5 schema markers.
checksums.
## Publish with rust_realease
Install [`rust_realease`](https://proxy.dandaedre.com/gitea/idle-org/rust_realease),
then pass the path of a readable Gitea token file to the repository wrapper:
```sh
./release.sh /path/to/token.txt --dry-run
./release.sh /path/to/token.txt
```
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. A hyphenated Cargo version such as
`0.1.27-rc.1` 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
package version as required by `rust_realease`.

6
fuzz/Cargo.lock generated
View File

@ -385,7 +385,7 @@ dependencies = [
[[package]]
name = "john-slop-core"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"directories",
"figment",
@ -411,7 +411,7 @@ dependencies = [
[[package]]
name = "john-slop-lsp"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"john-slop-core",
"serde_json",
@ -422,7 +422,7 @@ dependencies = [
[[package]]
name = "john_slop"
version = "0.1.26"
version = "0.1.27-rc.1"
dependencies = [
"clap",
"globset",

43
release.sh Executable file
View File

@ -0,0 +1,43 @@
#!/bin/sh
set -eu
usage() {
echo "usage: $0 <gitea-token-file> [rust_realease options...]" >&2
exit 2
}
[ "$#" -ge 1 ] || usage
token_file=$1
shift
if [ ! -f "$token_file" ] || [ ! -r "$token_file" ]; then
echo "token file is not a readable regular file: $token_file" >&2
exit 2
fi
if ! command -v rust_realease >/dev/null 2>&1; then
echo "rust_realease is not installed or not available in PATH" >&2
exit 2
fi
GITEA_TOKEN=
IFS= read -r GITEA_TOKEN <"$token_file" || :
if [ -z "$GITEA_TOKEN" ]; then
echo "token file is empty: $token_file" >&2
exit 2
fi
export GITEA_TOKEN
repository_dir=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
manifest_version=$(sed -n 's/^version = "\([^"]*\)"/\1/p' "$repository_dir/Cargo.toml" | head -n 1)
set -- \
"$repository_dir" \
--package john_slop \
--artifact-format binary \
"$@"
case "$manifest_version" in
*-*) set -- "$@" --prerelease ;;
esac
exec rust_realease "$@"

View File

@ -32,15 +32,6 @@ for binary in john-slop john-slop-fmt john-slop-lsp; do
done
cp README.md CHANGELOG.md LICENSE "$bundle_dir/"
cargo cyclonedx \
--manifest-path Cargo.toml \
--all-features \
--format json \
--spec-version 1.5 \
--target "$target_triple" \
--override-filename sbom.cdx
mv sbom.cdx.json "$bundle_dir/sbom.cdx.json"
commit=$(git rev-parse HEAD)
rust_version=$(rustc --version)
cargo_version=$(cargo --version)
@ -55,7 +46,7 @@ cargo_version=$(cargo --version)
(
cd "$bundle_dir"
sha256sum john-slop john-slop-fmt john-slop-lsp sbom.cdx.json >SHA256SUMS
sha256sum john-slop john-slop-fmt john-slop-lsp >SHA256SUMS
)
tar \

View File

@ -226,7 +226,7 @@ same config.
- [x] Benchmark large files, many small files, rule scaling, and archive limits.
Add parallelism only if measurement shows a benefit and output remains ordered.
- [x] Review dependency features, licenses, advisories, unsafe code, and release
binary size. Generate an SBOM/checksums if releases distribute binaries.
binary size. Generate checksums if releases distribute binaries.
- [x] Add changelog, contribution guide, code of conduct, security reporting
instructions, release profile, and reproducible release procedure.
- [x] Run a false-positive review against the evaluation corpus and require an
@ -701,6 +701,52 @@ policy/audit checks, Unicode-catalog reproducibility, and workspace package
assembly pass; coverage is 92.72% (1,604/1,730 lines), and all release metadata
and binary versions agree on `0.1.26`.
## Post-milestone CI maintenance
- [x] Prevent retained release bundles from breaking later builds in a reused
Jenkins workspace, and keep release packaging limited to the artifacts the
project currently distributes.
- [x] Replace the yanked transitive `yoke-derive 0.8.3` lockfile entry with the
compatible non-yanked `0.8.4` release so the deny-warnings audit remains
reproducible.
- [x] Ignore legacy per-package `cargo cyclonedx` intermediates left by earlier
builds so workspace packaging remains clean after SBOM generation is removed.
- [x] Remove Jenkins Tarpaulin installation and execution while the job does not
publish coverage artifacts; retain the local 90% release gate.
Acceptance: release packaging emits archive and binary checksums, and Jenkins
can rebuild the same release commit with an earlier `dist/` bundle or legacy
SBOM intermediates still present; the locked dependency graph passes the
configured audit and deny policies.
## Post-milestone release publishing
- [x] Add a small `release.sh` wrapper that reads a Gitea token from a supplied
file, keeps it out of process arguments, and delegates the tagged `john_slop`
release to `rust_realease` with optional arguments such as `--dry-run`.
Acceptance: missing, unreadable, and empty token files fail before publication;
the token reaches `rust_realease` through `GITEA_TOKEN`, never an argument; and
the wrapper selects the root workspace package and binary artifact mode.
## Release candidate 0.1.27-rc.1
- [x] Synchronize the workspace, internal dependencies, lockfiles, evaluation
sign-off, changelog, and version badge at `0.1.27-rc.1`; make the release
wrapper mark hyphenated versions as prereleases.
- [x] Run the complete quality, audit, package, and wrapper-contract gates before
creating the immutable annotated `v0.1.27-rc.1` tag.
Acceptance: all package and binary versions report `0.1.27-rc.1`; the release
wrapper expects `v0.1.27-rc.1` at the current checkout and passes `--prerelease`;
all gates pass before the local tag is created for explicit push and publication.
Accepted on 2026-09-30 after formatting, Clippy, rustdoc, both feature matrices,
RustSec and dependency-policy checks, workspace package assembly, exact binary
version checks, and the RC wrapper contract passed. Coverage is 92.72%; all
workspace packages, lockfiles, evaluation sign-off, changelog, and the generated
badge agree on `0.1.27-rc.1`.
## Deferred by design
- Statistical or model-based authorship classification.

View File

@ -1,5 +1,5 @@
schema_version = 1
release = "0.1.26"
release = "0.1.27-rc.1"
reviewed_on = "2026-09-30"
status = "accepted-with-runtime-catalog-boundary"
catalog_sha256 = "da34ce00dfd2d801e772fa440d932abb98c929f5ad08ff3ad5e47e0ed4d84d5a"