move everything to MSRV 1.70, wasm stays MSRV 1.74

tamasfe · Aug 6, 2024 · ee8de51 · ee8de51
1 parent 590d6b3
commit ee8de51
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -84,17 +84,12 @@ jobs:
       - name: Install latest Rust toolchain
         run: |
           rustup update --no-self-update
-          rustup default 1.67
-          rustup toolchain add 1.70
+          rustup default 1.70
       - uses: Swatinem/rust-cache@v2
-      - name: Test MSRV for lsp-async-stub/taplo-common/taplo-lsp
-        run: |
-          cargo +1.67 check -p lsp-async-stub -p taplo-common -p taplo-lsp
-          cargo +1.67 test  -p lsp-async-stub -p taplo-common -p taplo-lsp
       - name: Test MSRV for taplo
         run: |
-          cargo +1.70 check -p taplo-common -p taplo-lsp
-          cargo +1.70 test  -p taplo-common -p taplo-lsp
+          cargo check -p lsp-async-stub -p taplo-common -p taplo-lsp -p taplo
+          cargo test  -p lsp-async-stub -p taplo-common -p taplo-lsp -p taplo
 
   test-msrv-bin:
     name: Test binaries with MSRV
@@ -104,14 +99,25 @@ jobs:
       - name: Install latest Rust toolchain
         run: |
           rustup update --no-self-update
-          rustup default 1.74
-          rustup target install wasm32-unknown-unknown
+          rustup default 1.70
       - uses: Swatinem/rust-cache@v2
       - name: Test taplo-cli
         run: |
-          cargo +1.74 check -p taplo-cli
-          cargo +1.74 test -p taplo-cli
+          cargo check -p taplo-cli
+          cargo test  -p taplo-cli
+
+  test-msrv-wasm:
+    name: Test WASM with MSRV
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install latest Rust toolchain
+        run: |
+          rustup update --no-self-update
+          rustup default 1.74
+          rustup target install wasm32-unknown-unknown
+      - uses: Swatinem/rust-cache@v2
       - name: Test taplo-wasm
         working-directory: crates/taplo-wasm
         run: |
-          cargo +1.74 check
+          cargo check
diff --git a/crates/lsp-async-stub/Cargo.toml b/crates/lsp-async-stub/Cargo.toml
@@ -2,7 +2,7 @@
 name         = "lsp-async-stub"
 description  = "An LSP server stub for futures"
 version      = "0.6.4"
-rust-version = "1.67"
+rust-version = "1.70"
 authors      = { workspace = true }
 edition      = { workspace = true }
 homepage     = { workspace = true }

diff --git a/crates/taplo-cli/Cargo.toml b/crates/taplo-cli/Cargo.toml
@@ -2,7 +2,7 @@
 name         = "taplo-cli"
 description  = "A CLI for Taplo TOML toolkit"
 version      = "0.9.3"
-rust-version = "1.74"
+rust-version = "1.70"
 categories   = ["development-tools", "command-line-utilities"]
 keywords     = ["toml", "linter", "formatter"]
 authors      = { workspace = true }

diff --git a/crates/taplo-common/Cargo.toml b/crates/taplo-common/Cargo.toml
@@ -2,7 +2,7 @@
 name         = "taplo-common"
 description  = "Shared code for taplo utilities."
 version      = "0.5.2"
-rust-version = "1.67"
+rust-version = "1.70"
 authors      = { workspace = true }
 edition      = { workspace = true }
 homepage     = { workspace = true }

diff --git a/crates/taplo-lsp/Cargo.toml b/crates/taplo-lsp/Cargo.toml
@@ -2,7 +2,7 @@
 name         = "taplo-lsp"
 description  = "Language server for Taplo"
 version      = "0.7.2"
-rust-version = "1.67"
+rust-version = "1.70"
 authors      = { workspace = true }
 edition      = { workspace = true }
 homepage     = { workspace = true }