Skip to content

Commit db8fa82

Browse files
authored
internal: bump rust to 1.90.0 (#659)
rel: #333 (comment)
1 parent 7c08ade commit db8fa82

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.github/workflows/rust.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
- name: Install Toolchain
8989
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
9090
with:
91-
toolchain: 1.88.0
91+
toolchain: 1.90.0
9292
targets: ${{ matrix.target }}
9393

9494
- name: Cache
@@ -285,7 +285,7 @@ jobs:
285285
- name: Install Toolchain
286286
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
287287
with:
288-
toolchain: 1.88.0
288+
toolchain: 1.90.0
289289
components: clippy, rustfmt
290290

291291
- name: Cache
@@ -310,7 +310,7 @@ jobs:
310310
- name: Install Toolchain
311311
uses: dtolnay/rust-toolchain@4305c38b25d97ef35a8ad1f985ccf2d2242004f2 # stable
312312
with:
313-
toolchain: 1.88.0
313+
toolchain: 1.90.0
314314

315315
- name: Cache
316316
uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # pin@v2

Cargo.toml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
[workspace.package]
66
version = "2.26.0"
77
edition = "2024"
8-
rust-version = "1.88.0"
8+
rust-version = "1.90.0"
99
authors = ["Squawk Team & Contributors"]
1010
license = "Apache-2.0 OR MIT"
1111

@@ -53,12 +53,13 @@ xshell = "0.2.7"
5353
proc-macro2 = "1.0.95"
5454

5555
# local
56-
squawk_github = { path = "./crates/squawk_github" }
57-
squawk_lexer = { path = "./crates/squawk_lexer" }
58-
squawk_parser = { path = "./crates/squawk_parser" }
59-
squawk_syntax = { path = "./crates/squawk_syntax" }
60-
squawk_linter = { path = "./crates/squawk_linter" }
61-
squawk_server = { path = "./crates/squawk_server" }
56+
# we have to make the versions explicit otherwise `cargo publish` won't work
57+
squawk_github = { path = "./crates/squawk_github", version = "2.26.0" }
58+
squawk_lexer = { path = "./crates/squawk_lexer", version = "2.26.0" }
59+
squawk_parser = { path = "./crates/squawk_parser", version = "2.26.0" }
60+
squawk_syntax = { path = "./crates/squawk_syntax", version = "2.26.0" }
61+
squawk_linter = { path = "./crates/squawk_linter", version = "2.26.0" }
62+
squawk_server = { path = "./crates/squawk_server", version = "2.26.0" }
6263

6364
[workspace.lints.clippy]
6465
collapsible_else_if = "allow"

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
22
targets = ["x86_64-unknown-linux-gnu", "x86_64-apple-darwin", "aarch64-apple-darwin"]
3-
channel = "1.88.0"
3+
channel = "1.90.0"

s/update-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ main() {
2626
git checkout -b "release-$NEW_VERSION"
2727
echo "updating version to '$NEW_VERSION'..."
2828
fastmod --accept-all '^version = ".*"' 'version = "'$NEW_VERSION'"' Cargo.toml
29+
fastmod --accept-all '(squawk_[a-z_]+ = \{ path = "[^"]+", )version = "[^"]+"' '${1}version = "'$NEW_VERSION'"' Cargo.toml
2930
fastmod --accept-all -m '(name = "squawk"\n)version = ".*?"' '${1}version = "'$NEW_VERSION'"' Cargo.lock
3031
fastmod --accept-all '"version": ".*"' '"version": "'$NEW_VERSION'"' package.json
3132
fastmod --accept-all '"version": ".*"' '"version": "'$NEW_VERSION'"' squawk-vscode/package.json

0 commit comments

Comments
 (0)