From 85c3ed22f2ce601d2c2a735d377b07f0d01718c8 Mon Sep 17 00:00:00 2001 From: Steve Dignam Date: Tue, 16 Dec 2025 18:14:06 -0500 Subject: [PATCH] release: 2.33.1 --- CHANGELOG.md | 6 ++++++ Cargo.lock | 20 ++++++++++---------- Cargo.toml | 16 ++++++++-------- crates/squawk_github/src/app.rs | 2 +- flake.nix | 2 +- package.json | 2 +- s/update-version | 12 ++++++------ squawk-vscode/package.json | 2 +- 8 files changed, 34 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58e0ec25..5119d263 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## v2.33.1 - 2025-12-16 + +### Fixed + +- ci: npm trusted publishing (#741) + ## v2.33.0 - 2025-12-16 ### Added diff --git a/Cargo.lock b/Cargo.lock index dc2b12ee..34f1a87c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1837,7 +1837,7 @@ dependencies = [ [[package]] name = "squawk" -version = "2.33.0" +version = "2.33.1" dependencies = [ "annotate-snippets", "anyhow", @@ -1866,7 +1866,7 @@ dependencies = [ [[package]] name = "squawk-github" -version = "2.33.0" +version = "2.33.1" dependencies = [ "jsonwebtoken", "log", @@ -1877,7 +1877,7 @@ dependencies = [ [[package]] name = "squawk-ide" -version = "2.33.0" +version = "2.33.1" dependencies = [ "annotate-snippets", "insta", @@ -1892,14 +1892,14 @@ dependencies = [ [[package]] name = "squawk-lexer" -version = "2.33.0" +version = "2.33.1" dependencies = [ "insta", ] [[package]] name = "squawk-linter" -version = "2.33.0" +version = "2.33.1" dependencies = [ "enum-iterator", "insta", @@ -1913,7 +1913,7 @@ dependencies = [ [[package]] name = "squawk-parser" -version = "2.33.0" +version = "2.33.1" dependencies = [ "camino", "dir-test", @@ -1926,7 +1926,7 @@ dependencies = [ [[package]] name = "squawk-server" -version = "2.33.0" +version = "2.33.1" dependencies = [ "anyhow", "insta", @@ -1946,7 +1946,7 @@ dependencies = [ [[package]] name = "squawk-syntax" -version = "2.33.0" +version = "2.33.1" dependencies = [ "camino", "dir-test", @@ -1958,7 +1958,7 @@ dependencies = [ [[package]] name = "squawk-wasm" -version = "2.33.0" +version = "2.33.1" dependencies = [ "console_error_panic_hook", "console_log", @@ -2775,7 +2775,7 @@ checksum = "32ac00cd3f8ec9c1d33fb3e7958a82df6989c42d747bd326c822b1d625283547" [[package]] name = "xtask" -version = "2.33.0" +version = "2.33.1" dependencies = [ "anyhow", "camino", diff --git a/Cargo.toml b/Cargo.toml index 7dba42cf..eceb379f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = ["crates/*"] resolver = "2" [workspace.package] -version = "2.33.0" +version = "2.33.1" edition = "2024" rust-version = "1.90.0" authors = ["Squawk Team & Contributors"] @@ -60,13 +60,13 @@ snapbox = { version = "0.6.0", features = ["diff", "term-svg", "cmd"] } # local # we have to make the versions explicit otherwise `cargo publish` won't work -squawk-github = { path = "./crates/squawk_github", version = "2.33.0" } -squawk-ide = { path = "./crates/squawk_ide", version = "2.33.0" } -squawk-lexer = { path = "./crates/squawk_lexer", version = "2.33.0" } -squawk-parser = { path = "./crates/squawk_parser", version = "2.33.0" } -squawk-syntax = { path = "./crates/squawk_syntax", version = "2.33.0" } -squawk-linter = { path = "./crates/squawk_linter", version = "2.33.0" } -squawk-server = { path = "./crates/squawk_server", version = "2.33.0" } +squawk-github = { path = "./crates/squawk_github", version = "2.33.1" } +squawk-ide = { path = "./crates/squawk_ide", version = "2.33.1" } +squawk-lexer = { path = "./crates/squawk_lexer", version = "2.33.1" } +squawk-parser = { path = "./crates/squawk_parser", version = "2.33.1" } +squawk-syntax = { path = "./crates/squawk_syntax", version = "2.33.1" } +squawk-linter = { path = "./crates/squawk_linter", version = "2.33.1" } +squawk-server = { path = "./crates/squawk_server", version = "2.33.1" } [workspace.lints.clippy] collapsible_else_if = "allow" diff --git a/crates/squawk_github/src/app.rs b/crates/squawk_github/src/app.rs index cf34dc3d..faae24eb 100644 --- a/crates/squawk_github/src/app.rs +++ b/crates/squawk_github/src/app.rs @@ -11,7 +11,7 @@ use serde_json::Value; use std::time::Duration; use std::time::{SystemTime, UNIX_EPOCH}; -pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.33.0"; +pub(crate) const SQUAWK_USER_AGENT: &str = "squawk/2.33.1"; #[derive(Debug, Serialize)] struct CommentBody { diff --git a/flake.nix b/flake.nix index 3c605dba..c59e6641 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ { squawk = final.rustPlatform.buildRustPackage { pname = "squawk"; - version = "2.33.0"; + version = "2.33.1"; cargoLock = { lockFile = ./Cargo.lock; diff --git a/package.json b/package.json index 4375d7b0..3ae07feb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "squawk-cli", - "version": "2.33.0", + "version": "2.33.1", "description": "linter for PostgreSQL, focused on migrations", "repository": "git@github.com:sbdchd/squawk.git", "author": "Squawk Team & Contributors", diff --git a/s/update-version b/s/update-version index 30824068..955171eb 100755 --- a/s/update-version +++ b/s/update-version @@ -16,14 +16,14 @@ main() { echo "Auto-incrementing to $NEW_VERSION" fi - echo "Checking out master branch..." - if ! git checkout master; then - echo "Error: Failed to checkout master branch" + echo "Switching to master branch..." + if ! git switch master; then + echo "Error: Failed to switch to master branch" exit 1 fi - echo "Creating new release branch: release-$NEW_VERSION" - git checkout -b "release-$NEW_VERSION" + echo "Switching to release branch: release-$NEW_VERSION" + git switch "release-$NEW_VERSION" 2>/dev/null || git switch -c "release-$NEW_VERSION" echo "updating version to '$NEW_VERSION'..." fastmod --accept-all '^version = ".*"' 'version = "'$NEW_VERSION'"' Cargo.toml fastmod --accept-all '(squawk-[a-z_]+ = \{ path = "[^"]+", )version = "[^"]+"' '${1}version = "'$NEW_VERSION'"' Cargo.toml @@ -44,7 +44,7 @@ main() { echo "Fetching commits since $LATEST_TAG..." COMMITS_FILE=$(mktemp) - git log ${LATEST_TAG}..HEAD --pretty=format:"- %s" > "$COMMITS_FILE" + git log ${LATEST_TAG}..master --pretty=format:"- %s" > "$COMMITS_FILE" TEMP_CHANGELOG=$(mktemp) awk -v date="$CURRENT_DATE" -v version="$NEW_VERSION" -v commits_file="$COMMITS_FILE" ' diff --git a/squawk-vscode/package.json b/squawk-vscode/package.json index 998a4b14..565c769f 100644 --- a/squawk-vscode/package.json +++ b/squawk-vscode/package.json @@ -9,7 +9,7 @@ "icon": "icon.png", "author": "Squawk Team & Contributors", "license": "(Apache-2.0 OR MIT)", - "version": "2.33.0", + "version": "2.33.1", "engines": { "vscode": "^1.101.0" },