diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index ba5e8482..0427b6a1 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -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 @@ -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 @@ -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 diff --git a/Cargo.toml b/Cargo.toml index 9b9a182d..e79c5184 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" @@ -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" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 01818ea2..5ed3110d 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -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" diff --git a/s/update-version b/s/update-version index e97ce0f9..dadd1301 100755 --- a/s/update-version +++ b/s/update-version @@ -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