Merge pull request #638 from tiziodcaio/main

Build linked runtime by default
filips123 · Feb 11, 2025 · 02e9341 · 02e9341
2 parents f522eba + 3b948bf
commit 02e9341
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 15 deletions.
diff --git a/.github/workflows/native.yaml b/.github/workflows/native.yaml
@@ -455,7 +455,7 @@ jobs:
           path: signed/paf/*.paf.exe
           compression-level: 0
 
-      # == BUILD PROVENANCE
+      # == Build Provenance
 
       - name: Attest artifacts
         if: startsWith(github.ref, 'refs/tags/v')

diff --git a/native/Cargo.toml b/native/Cargo.toml
@@ -23,7 +23,6 @@ lto = true
 portable = ["dep:phf"]
 static = ["reqwest/native-tls-vendored", "bzip2/static", "xz2/static"]
 immutable-runtime = []
-linked-runtime = ["dep:blake3"]
 
 [dependencies]
 ab_glyph = "0.2.29"
@@ -77,9 +76,9 @@ features = [
 [target.'cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
 glob = "0.3.2"
 phf = { version = "0.11.2", features = ["macros"] }
-blake3 = { version = "1.5.5", optional = true }
 
 [target.'cfg(target_os = "linux")'.dependencies]
+blake3 = "1.5.5"
 bzip2 = "0.5.0"
 xz2 = "0.1.7"
 tar = "0.4.43"

diff --git a/native/src/components/runtime.rs b/native/src/components/runtime.rs
@@ -240,7 +240,7 @@ impl Runtime {
         const COPY_ERROR: &str = "Failed to copy the runtime";
         const CLEANUP_ERROR: &str = "Failed to clean up the runtime";
 
-        #[cfg(feature = "linked-runtime")]
+        #[cfg(platform_linux)]
         {
             use crate::storage::Storage;
 
@@ -352,7 +352,7 @@ impl Runtime {
         Ok(())
     }
 
-    #[cfg(feature = "linked-runtime")]
+    #[cfg(platform_linux)]
     pub fn link(&self) -> Result<()> {
         use std::fs::{copy, create_dir_all};
         use std::os::unix::fs::symlink;

diff --git a/native/src/connector/process.rs b/native/src/connector/process.rs
@@ -84,7 +84,7 @@ impl Process for SetConfig {
 impl Process for InstallRuntime {
     fn process(&self, _connection: &Connection) -> Result<ConnectorResponse> {
         let command = RuntimeInstallCommand {
-            #[cfg(feature = "linked-runtime")]
+            #[cfg(platform_linux)]
             link: self.link,
         };
         command.run()?;

diff --git a/native/src/connector/request.rs b/native/src/connector/request.rs
@@ -153,15 +153,14 @@ pub struct SetConfig(pub Config);
 ///
 /// [`ConnectorResponse::RuntimeInstalled`] - No data.
 ///
-
-#[cfg(feature = "linked-runtime")]
+#[cfg(platform_linux)]
 #[derive(Deserialize, Debug, Eq, PartialEq, Clone)]
 pub struct InstallRuntime {
     /// Experimental: Use a linked runtime instead of downloading from Mozilla.
     pub link: bool,
 }
 
-#[cfg(not(feature = "linked-runtime"))]
+#[cfg(not(platform_linux))]
 #[derive(Debug, Eq, PartialEq, Clone)]
 pub struct InstallRuntime;
 
@@ -612,7 +611,7 @@ impl Into<crate::console::app::HTTPClientConfig> for HTTPClientConfig {
 
 deserialize_unit_struct!(GetSystemVersions);
 deserialize_unit_struct!(GetConfig);
-#[cfg(not(feature = "linked-runtime"))]
+#[cfg(not(platform_linux))]
 deserialize_unit_struct!(InstallRuntime);
 deserialize_unit_struct!(UninstallRuntime);
 deserialize_unit_struct!(GetSiteList);

diff --git a/native/src/console/app.rs b/native/src/console/app.rs
@@ -277,7 +277,7 @@ pub enum RuntimeCommand {
 #[derive(Parser, Debug, Eq, PartialEq, Clone)]
 pub struct RuntimeInstallCommand {
     /// Experimental: Use a linked runtime instead of downloading from Mozilla
-    #[cfg(feature = "linked-runtime")]
+    #[cfg(target_os = "linux")]
     #[clap(long)]
     pub link: bool,
 }

diff --git a/native/src/console/runtime.rs b/native/src/console/runtime.rs
@@ -26,14 +26,14 @@ impl Run for RuntimeInstallCommand {
         let dirs = ProjectDirs::new()?;
         let runtime = Runtime::new(&dirs)?;
 
-        #[cfg(feature = "linked-runtime")]
+        #[cfg(platform_linux)]
         if self.link {
             runtime.link().context("Failed to link runtime")?
         } else {
             runtime.install().context("Failed to install runtime")?;
         }
 
-        #[cfg(not(feature = "linked-runtime"))]
+        #[cfg(not(platform_linux))]
         runtime.install().context("Failed to install runtime")?;
 
         let runtime = Runtime::new(&dirs)?;

diff --git a/native/src/console/site.rs b/native/src/console/site.rs
@@ -46,7 +46,7 @@ impl Run for SiteLaunchCommand {
             bail!("Runtime not installed");
         }
 
-        #[cfg(feature = "linked-runtime")]
+        #[cfg(platform_linux)]
         {
             use std::fs::File;
             use std::io::Read;

diff --git a/native/src/storage.rs b/native/src/storage.rs
@@ -49,7 +49,7 @@ pub struct Config {
     /// May be overwritten with a system environment variable.
     pub runtime_use_portals: bool,
 
-    #[cfg(feature = "linked-runtime")]
+    #[cfg(platform_linux)]
     /// Experimental: Using the system runtime to save some disk space.
     /// This might not work on your system.
     pub use_linked_runtime: bool,