Răsfoiți Sursa

Fix #2378: CLI MSRV and add MSRV to CI (#2716)

* Fix: bump msrv up to be valid for cli
* add binstall check to ci
* adjust msrv of tomls
Jonathan Kelley 11 luni în urmă
părinte
comite
c4e55c7fb6

+ 23 - 1
.github/workflows/main.yml

@@ -55,6 +55,28 @@ jobs:
           save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo check --all --examples --tests --all-features --all-targets
 
+  check-msrv:
+    if: github.event.pull_request.draft == false
+    name: Check MSRV
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-all-crates: "true"
+          save-if: ${{ github.ref == 'refs/heads/main' }}
+      # https://github.com/foresterre/cargo-msrv/blob/4345edfe3f4fc91cc8ae6c7d6804c0748fae92ae/.github/workflows/msrv.yml
+      - name: install_cargo_msrv
+        run: cargo install cargo-msrv --all-features
+      - name: version_of_cargo_msrv
+        run: cargo msrv --version
+      - name: run_cargo_msrv
+        run: cargo msrv --output-format json verify -- cargo check
+      - name: run_cargo_msrv_on_verify_failure
+        if: ${{ failure() }}
+        run: cargo msrv --output-format json -- cargo check
+
   test:
     if: github.event.pull_request.draft == false
     name: Test Suite
@@ -117,7 +139,7 @@ jobs:
           cache-all-crates: "true"
           save-if: ${{ github.ref == 'refs/heads/main' }}
       - run: cargo fmt --all -- --check
-  
+
   typos:
     if: github.event.pull_request.draft == false
     name: Check for typos

+ 1 - 1
Cargo.toml

@@ -171,7 +171,7 @@ repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
 documentation = "https://dioxuslabs.com"
 keywords = ["dom", "ui", "gui", "react", "wasm"]
-rust-version = "1.60.0"
+rust-version = "1.79.0"
 publish = false
 
 [dependencies]

+ 0 - 1
examples/tailwind/Cargo.toml

@@ -8,7 +8,6 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
 documentation = "https://dioxuslabs.com"
-rust-version = "1.60.0"
 publish = false
 
 [dependencies]

+ 1 - 0
packages/cli/Cargo.toml

@@ -8,6 +8,7 @@ description = "CLI tool for developing, testing, and publishing Dioxus apps"
 repository = "https://github.com/DioxusLabs/dioxus/"
 license = "MIT OR Apache-2.0"
 keywords = ["react", "gui", "cli", "dioxus", "wasm"]
+rust-version = "1.79.0"
 
 [dependencies]
 # cli core

+ 1 - 1
packages/dioxus-lib/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com/learn/0.5/"
 keywords = ["dom", "ui", "gui", "react", "wasm"]
-rust-version = "1.65.0"
+rust-version = "1.79.0"
 
 [dependencies]
 dioxus-core = { workspace = true }

+ 1 - 1
packages/dioxus/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com/learn/0.5/"
 keywords = ["dom", "ui", "gui", "react", "wasm"]
-rust-version = "1.65.0"
+rust-version = "1.79.0"
 
 [dependencies]
 dioxus-core = { workspace = true }

+ 1 - 1
packages/rsx/src/hotreload.rs

@@ -155,7 +155,7 @@ impl HotReloadedTemplate {
         //
         // The paths will be different but the dynamic indexes will be the same
         let template = new.to_template_with_custom_paths::<Ctx>(
-            intern(self.make_location(old.template_idx.get()).leak()),
+            intern(self.make_location(old.template_idx.get())),
             new_node_paths,
             new_attribute_paths,
         );

+ 1 - 1
packages/signals/Cargo.toml

@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
 keywords = ["dom", "ui", "gui", "react", "wasm"]
-rust-version = "1.64.0"
+rust-version = "1.79.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html