Browse Source

check semvers

Jonathan Kelley 6 days ago
parent
commit
abed95c606
2 changed files with 11 additions and 8 deletions
  1. 7 7
      packages/cli/src/build/request.rs
  2. 4 1
      packages/cli/src/workspace.rs

+ 7 - 7
packages/cli/src/build/request.rs

@@ -2426,13 +2426,13 @@ impl BuildRequest {
         // ./Configure android-arm64 -D__ANDROID_API__=29
         // make
         //
-        let tools_dir = tools.android_tools_dir();
-        let extended_path = format!(
-            "{}:{}",
-            tools_dir.display(),
-            std::env::var("PATH").unwrap_or_default()
-        );
-        env_vars.push(("PATH".into(), extended_path));
+        // let tools_dir = tools.android_tools_dir();
+        // let extended_path = format!(
+        //     "{}:{}",
+        //     tools_dir.display(),
+        //     std::env::var("PATH").unwrap_or_default()
+        // );
+        // env_vars.push(("PATH".into(), extended_path));
 
         // We try to set the OPENLSSL_DIR by autodetecting it here
         if let Some(openssl_dir) = self.openssl_dir() {

+ 4 - 1
packages/cli/src/workspace.rs

@@ -197,7 +197,10 @@ impl Workspace {
         let max = dioxus_versions.iter().max().unwrap();
 
         // If the minimum dioxus version is greater than the current cli version, warn the user
-        if min > &dx_semver || max < &dx_semver {
+        if min > &dx_semver
+            || max < &dx_semver
+            || dioxus_versions.iter().any(|f| f.pre != dx_semver.pre)
+        {
             tracing::error!(
                 r#"🚫dx and dioxus versions are incompatible!
                   • dx version: {dx_semver}