Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Install Toolchain
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
with:
toolchain: 1.88.0
toolchain: 1.90.0
targets: ${{ matrix.target }}

- name: Cache
Expand Down Expand Up @@ -285,7 +285,7 @@ jobs:
- name: Install Toolchain
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
with:
toolchain: 1.88.0
toolchain: 1.90.0
components: clippy, rustfmt

- name: Cache
Expand All @@ -310,7 +310,7 @@ jobs:
- name: Install Toolchain
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
with:
toolchain: 1.88.0
toolchain: 1.90.0

- name: Cache
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2
Expand Down
15 changes: 8 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
[workspace.package]
version = "2.26.0"
edition = "2024"
rust-version = "1.88.0"
rust-version = "1.90.0"
authors = ["Squawk Team & Contributors"]
license = "Apache-2.0 OR MIT"

Expand Down Expand Up @@ -53,12 +53,13 @@ xshell = "0.2.7"
proc-macro2 = "1.0.95"

# local
squawk_github = { path = "./crates/squawk_github" }
squawk_lexer = { path = "./crates/squawk_lexer" }
squawk_parser = { path = "./crates/squawk_parser" }
squawk_syntax = { path = "./crates/squawk_syntax" }
squawk_linter = { path = "./crates/squawk_linter" }
squawk_server = { path = "./crates/squawk_server" }
# we have to make the versions explicit otherwise `cargo publish` won't work
squawk_github = { path = "./crates/squawk_github", version = "2.26.0" }
squawk_lexer = { path = "./crates/squawk_lexer", version = "2.26.0" }
squawk_parser = { path = "./crates/squawk_parser", version = "2.26.0" }
squawk_syntax = { path = "./crates/squawk_syntax", version = "2.26.0" }
squawk_linter = { path = "./crates/squawk_linter", version = "2.26.0" }
squawk_server = { path = "./crates/squawk_server", version = "2.26.0" }

[workspace.lints.clippy]
collapsible_else_if = "allow"
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "aarch64-apple-darwin"]
channel = "1.88.0"
channel = "1.90.0"
1 change: 1 addition & 0 deletions s/update-version
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ main() {
git checkout -b "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
fastmod --accept-all -m '(name = "squawk"\n)version = ".*?"' '${1}version = "'$NEW_VERSION'"' Cargo.lock
fastmod --accept-all '"version": ".*"' '"version": "'$NEW_VERSION'"' package.json
fastmod --accept-all '"version": ".*"' '"version": "'$NEW_VERSION'"' squawk-vscode/package.json
Expand Down
Loading