From 5110d32142a5faba5a6bc6213dfeaf066a0685f1 Mon Sep 17 00:00:00 2001 From: Jack Amadeo Date: Tue, 11 Nov 2025 07:15:42 -0800 Subject: [PATCH] bump openapi version directly (#5674) --- Justfile | 5 ++++- crates/goose-server/src/bin/generate_schema.rs | 2 +- scripts/check-openapi-schema.sh | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Justfile b/Justfile index 6ba562538f..ce16e0a622 100644 --- a/Justfile +++ b/Justfile @@ -300,10 +300,13 @@ prepare-release version: # see --workspace flag https://doc.rust-lang.org/cargo/commands/cargo-update.html # used to update Cargo.lock after we've bumped versions in Cargo.toml @cargo update --workspace - @just generate-openapi + @just set-openapi-version {{ version }} @git add Cargo.toml Cargo.lock ui/desktop/package.json ui/desktop/package-lock.json ui/desktop/openapi.json @git commit --message "chore(release): release version {{ version }}" +set-openapi-version version: + @jq '.info.version |= "{{ version }}"' ui/desktop/openapi.json > ui/desktop/openapi.json.tmp && mv ui/desktop/openapi.json.tmp ui/desktop/openapi.json + # extract version from Cargo.toml get-tag-version: @uvx --from=toml-cli toml get --toml-path=Cargo.toml "workspace.package.version" diff --git a/crates/goose-server/src/bin/generate_schema.rs b/crates/goose-server/src/bin/generate_schema.rs index 8ddb867bef..ec5bd33aad 100644 --- a/crates/goose-server/src/bin/generate_schema.rs +++ b/crates/goose-server/src/bin/generate_schema.rs @@ -19,7 +19,7 @@ fn main() { fs::create_dir_all(parent).unwrap(); } - fs::write(&output_path, &schema).unwrap(); + fs::write(&output_path, format!("{schema}\n")).unwrap(); eprintln!( "Successfully generated OpenAPI schema at {}", output_path.canonicalize().unwrap().display() diff --git a/scripts/check-openapi-schema.sh b/scripts/check-openapi-schema.sh index cbf07ac831..d45f733f25 100755 --- a/scripts/check-openapi-schema.sh +++ b/scripts/check-openapi-schema.sh @@ -8,7 +8,7 @@ echo "🔍 Checking OpenAPI schema is up-to-date..." # Check if the generated schema differs from the committed version echo "🔍 Comparing generated schema with committed version..." -if ! git diff --exit-code ui/desktop/openapi.json ui/desktop/src/api/; then +if ! git diff --ignore-space-change --exit-code ui/desktop/openapi.json ui/desktop/src/api/; then echo "" echo "❌ OpenAPI schema is out of date!" echo ""