[rust] Build selenium-manager for win32 (compatible when executed in win64) (#11788)

bonigarcia · web-flow · commit ec3ed70517c1 · 2023-04-04T09:46:38.000+02:00
* [CI] Build selenium-manager for win32 in GH Actions

* [CI] Remove build for selenium-manager win64 in GH Actions

* [rust] Enable browser version and architecture detection both in Windows x32 and x64
diff --git a/.github/workflows/build-selenium-manager.yml b/.github/workflows/build-selenium-manager.yml
@@ -3,8 +3,8 @@ name: build-selenium-manager
 on: workflow_dispatch
 
 jobs:
-  windows:
-    name: "[Windows] Build selenium-manager"
+  win32:
+    name: "[Windows x32] Build selenium-manager"
     runs-on: windows-latest
     env:
       RUSTFLAGS: '-Ctarget-feature=+crt-static'
@@ -14,20 +14,22 @@ jobs:
       - name: "Update Rust"
         run: |
           rustup update
+          rustup toolchain install stable-i686-pc-windows-msvc
+          rustup default stable-i686-pc-windows-msvc
           rustc -vV
       - name: "Build release"
         run: |
           cd rust
-          cargo build --release --target x86_64-pc-windows-msvc
+          cargo build --release
       - name: "Upload binary"
         uses: actions/upload-artifact@v3
         with:
-          name: selenium-manager_windows-x64
-          path: rust/target/x86_64-pc-windows-msvc/release/selenium-manager.exe
+          name: selenium-manager_windows-x32
+          path: rust/target/release/selenium-manager.exe
           retention-days: 6
 
-  linux:
-    name: "[Linux] Build selenium-manager"
+  linux64:
+    name: "[Linux x64] Build selenium-manager"
     runs-on: ubuntu-latest
     env:
       RUSTFLAGS: '-Ctarget-feature=-crt-static'
@@ -58,8 +60,8 @@ jobs:
           path: selenium-manager.tar
           retention-days: 6
 
-  macos:
-    name: "[macOS] Build selenium-manager"
+  macos64:
+    name: "[macOS x64] Build selenium-manager"
     runs-on: macos-latest
     env:
       RUSTFLAGS: '-Ctarget-feature=+crt-static'
@@ -83,4 +85,4 @@ jobs:
         with:
           name: selenium-manager_macos-x64
           path: selenium-manager.tar
-          retention-days: 6
+          retention-days: 6
diff --git a/rust/src/chrome.rs b/rust/src/chrome.rs
@@ -30,9 +30,9 @@ use crate::metadata::{
     create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
 };
 use crate::{
-    create_http_client, format_one_arg, format_two_args, SeleniumManager, BETA, DASH_DASH_VERSION,
-    DEV, ENV_LOCALAPPDATA, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, FALLBACK_RETRIES, NIGHTLY,
-    REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
+    create_http_client, format_one_arg, format_three_args, SeleniumManager, BETA,
+    DASH_DASH_VERSION, DEV, ENV_LOCALAPPDATA, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86,
+    FALLBACK_RETRIES, NIGHTLY, REG_QUERY, REMOVE_X86, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
 pub const CHROME_NAME: &str = "chrome";
@@ -126,9 +126,19 @@ impl SeleniumManager for ChromeManager {
                 Some(path) => {
                     browser_path = path;
                     commands = vec![
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES, browser_path),
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES_X86, browser_path),
-                        format_two_args(WMIC_COMMAND_ENV, ENV_LOCALAPPDATA, browser_path),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES,
+                            REMOVE_X86,
+                            browser_path,
+                        ),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES_X86,
+                            "",
+                            browser_path,
+                        ),
+                        format_three_args(WMIC_COMMAND_ENV, ENV_LOCALAPPDATA, "", browser_path),
                     ];
                     if !self.is_browser_version_unstable() {
                         commands.push(format_one_arg(
diff --git a/rust/src/config.rs b/rust/src/config.rs
@@ -16,14 +16,9 @@
 // under the License.
 
 use crate::config::OS::{LINUX, MACOS, WINDOWS};
-use crate::TTL_BROWSERS_SEC;
-use crate::TTL_DRIVERS_SEC;
-
 use crate::files::get_cache_folder;
-use crate::{
-    format_one_arg, run_shell_command, ENV_PROCESSOR_ARCHITECTURE, REQUEST_TIMEOUT_SEC,
-    UNAME_COMMAND,
-};
+use crate::{format_one_arg, run_shell_command, REQUEST_TIMEOUT_SEC, UNAME_COMMAND};
+use crate::{ARCH_AMD64, ARCH_ARM64, ARCH_X86, TTL_BROWSERS_SEC, TTL_DRIVERS_SEC, WMIC_COMMAND_OS};
 use std::env;
 use std::env::consts::OS;
 use std::error::Error;
@@ -52,15 +47,22 @@ impl ManagerConfig {
     pub fn default(browser_name: &str, driver_name: &str) -> ManagerConfig {
         let self_os = OS;
         let self_arch = if WINDOWS.is(self_os) {
-            env::var(ENV_PROCESSOR_ARCHITECTURE).unwrap_or_default()
+            if run_shell_command(self_os, WMIC_COMMAND_OS.to_string())
+                .unwrap_or_default()
+                .contains("32")
+            {
+                ARCH_X86.to_string()
+            } else {
+                ARCH_AMD64.to_string()
+            }
         } else {
             let uname_a = format_one_arg(UNAME_COMMAND, "a");
             if run_shell_command(self_os, uname_a)
                 .unwrap_or_default()
                 .to_ascii_lowercase()
-                .contains(ARM64_ARCH)
+                .contains(ARCH_ARM64)
             {
-                ARM64_ARCH.to_string()
+                ARCH_ARM64.to_string()
             } else {
                 let uname_m = format_one_arg(UNAME_COMMAND, "m");
                 run_shell_command(self_os, uname_m).unwrap_or_default()
@@ -147,9 +149,9 @@ pub enum ARCH {
 impl ARCH {
     pub fn to_str_vector(&self) -> Vec<&str> {
         match self {
-            ARCH::X32 => vec!["x86", "i386"],
-            ARCH::X64 => vec!["x86_64", "x64", "i686", "amd64", "ia64"],
-            ARCH::ARM64 => vec![ARM64_ARCH, "aarch64", "arm"],
+            ARCH::X32 => vec![ARCH_X86, "i386"],
+            ARCH::X64 => vec![ARCH_AMD64, "x86_64", "x64", "i686", "ia64"],
+            ARCH::ARM64 => vec![ARCH_ARM64, "aarch64", "arm"],
         }
     }
 
diff --git a/rust/src/edge.rs b/rust/src/edge.rs
@@ -29,9 +29,9 @@ use crate::metadata::{
     create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
 };
 use crate::{
-    create_http_client, format_one_arg, format_two_args, Logger, SeleniumManager, BETA,
+    create_http_client, format_one_arg, format_three_args, Logger, SeleniumManager, BETA,
     DASH_DASH_VERSION, DEV, ENV_LOCALAPPDATA, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, NIGHTLY,
-    REG_QUERY, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
+    REG_QUERY, REMOVE_X86, STABLE, WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
 pub const EDGE_NAMES: &[&str] = &["edge", "msedge", "microsoftedge"];
@@ -126,9 +126,19 @@ impl SeleniumManager for EdgeManager {
                 Some(path) => {
                     browser_path = path;
                     commands = vec![
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES_X86, browser_path),
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES, browser_path),
-                        format_two_args(WMIC_COMMAND, ENV_LOCALAPPDATA, browser_path),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES_X86,
+                            "",
+                            browser_path,
+                        ),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES,
+                            REMOVE_X86,
+                            browser_path,
+                        ),
+                        format_three_args(WMIC_COMMAND, ENV_LOCALAPPDATA, "", browser_path),
                     ];
                     if !self.is_browser_version_unstable() {
                         commands.push(format_one_arg(
diff --git a/rust/src/firefox.rs b/rust/src/firefox.rs
@@ -29,9 +29,9 @@ use crate::metadata::{
     create_driver_metadata, get_driver_version_from_metadata, get_metadata, write_metadata,
 };
 use crate::{
-    create_http_client, format_one_arg, format_two_args, Logger, SeleniumManager, BETA,
-    DASH_VERSION, DEV, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, NIGHTLY, STABLE, WMIC_COMMAND,
-    WMIC_COMMAND_ENV,
+    create_http_client, format_one_arg, format_three_args, Logger, SeleniumManager, BETA,
+    DASH_VERSION, DEV, ENV_PROGRAM_FILES, ENV_PROGRAM_FILES_X86, NIGHTLY, REMOVE_X86, STABLE,
+    WMIC_COMMAND, WMIC_COMMAND_ENV,
 };
 
 pub const FIREFOX_NAME: &str = "firefox";
@@ -126,8 +126,18 @@ impl SeleniumManager for FirefoxManager {
                 Some(path) => {
                     browser_path = path;
                     commands = vec![
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES, browser_path),
-                        format_two_args(WMIC_COMMAND_ENV, ENV_PROGRAM_FILES_X86, browser_path),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES,
+                            REMOVE_X86,
+                            browser_path,
+                        ),
+                        format_three_args(
+                            WMIC_COMMAND_ENV,
+                            ENV_PROGRAM_FILES_X86,
+                            "",
+                            browser_path,
+                        ),
                     ];
                 }
                 _ => return None,
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
@@ -61,7 +61,9 @@ pub const DEV: &str = "dev";
 pub const CANARY: &str = "canary";
 pub const NIGHTLY: &str = "nightly";
 pub const WMIC_COMMAND: &str = r#"wmic datafile where name='{}' get Version /value"#;
-pub const WMIC_COMMAND_ENV: &str = r#"wmic datafile where name='%{}:\=\\%{}' get Version /value"#;
+pub const WMIC_COMMAND_ENV: &str =
+    r#"set PFILES=%{}{}%&& wmic datafile where name='!PFILES:\=\\!{}' get Version /value"#;
+pub const WMIC_COMMAND_OS: &str = r#"wmic os get osarchitecture"#;
 pub const REG_QUERY: &str = r#"REG QUERY {} /v version"#;
 pub const PLIST_COMMAND: &str =
     r#"/usr/libexec/PlistBuddy -c "print :CFBundleShortVersionString" {}/Contents/Info.plist"#;
@@ -70,6 +72,10 @@ pub const DASH_DASH_VERSION: &str = "{} --version";
 pub const ENV_PROGRAM_FILES: &str = "PROGRAMFILES";
 pub const ENV_PROGRAM_FILES_X86: &str = "PROGRAMFILES(X86)";
 pub const ENV_LOCALAPPDATA: &str = "LOCALAPPDATA";
+pub const REMOVE_X86: &str = ": (x86)=";
+pub const ARCH_X86: &str = "x86";
+pub const ARCH_AMD64: &str = "amd64";
+pub const ARCH_ARM64: &str = "arm64";
 pub const ENV_PROCESSOR_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const FALLBACK_RETRIES: u32 = 5;
 pub const WHERE_COMMAND: &str = "where {}";
@@ -528,7 +534,7 @@ pub fn create_http_client(timeout: u64, proxy: String) -> Result<Client, String>
 
 pub fn run_shell_command(os: &str, command: String) -> Result<String, Box<dyn Error>> {
     let (shell, flag) = if WINDOWS.is(os) {
-        ("cmd", "/C")
+        ("cmd", "/v/c")
     } else {
         ("sh", "-c")
     };
@@ -545,8 +551,11 @@ pub fn format_one_arg(string: &str, arg1: &str) -> String {
     string.replacen("{}", arg1, 1)
 }
 
-pub fn format_two_args(string: &str, arg1: &str, arg2: &str) -> String {
-    string.replacen("{}", arg1, 1).replacen("{}", arg2, 2)
+pub fn format_three_args(string: &str, arg1: &str, arg2: &str, arg3: &str) -> String {
+    string
+        .replacen("{}", arg1, 1)
+        .replacen("{}", arg2, 1)
+        .replacen("{}", arg3, 1)
 }
 
 // ----------------------------------------------------------
diff --git a/rust/src/metadata.rs b/rust/src/metadata.rs
@@ -155,12 +155,14 @@ pub fn write_metadata(metadata: &Metadata, log: &Logger) {
     .unwrap();
 }
 
-pub fn clear_metadata(log: &Logger){
+pub fn clear_metadata(log: &Logger) {
     let metadata_path = get_metadata_path();
-    log.trace(format!("Deleting metadata file {}", metadata_path.display()));
-    match fs::remove_file(metadata_path){
+    log.trace(format!(
+        "Deleting metadata file {}",
+        metadata_path.display()
+    ));
+    match fs::remove_file(metadata_path) {
         Ok(()) => log.trace("Metadata file was deleted".to_string()),
-        Err(err) => log.warn(
-            format!("Metadata file deleting invoked an error: {}",err)),
+        Err(err) => log.warn(format!("Metadata file deleting invoked an error: {}", err)),
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -155,12 +155,14 @@ pub fn write_metadata(metadata: &Metadata, log: &Logger) {`
`155`	`155`	`.unwrap();`
`156`	`156`	`}`
`157`	`157`
`158`		`-pub fn clear_metadata(log: &Logger){`
	`158`	`+pub fn clear_metadata(log: &Logger) {`
`159`	`159`	`let metadata_path = get_metadata_path();`
`160`		`- log.trace(format!("Deleting metadata file {}", metadata_path.display()));`
`161`		`- match fs::remove_file(metadata_path){`
	`160`	`+ log.trace(format!(`
	`161`	`+ "Deleting metadata file {}",`
	`162`	`+ metadata_path.display()`
	`163`	`+ ));`
	`164`	`+ match fs::remove_file(metadata_path) {`
`162`	`165`	`Ok(()) => log.trace("Metadata file was deleted".to_string()),`
`163`		`- Err(err) => log.warn(`
`164`		`- format!("Metadata file deleting invoked an error: {}",err)),`
	`166`	`+ Err(err) => log.warn(format!("Metadata file deleting invoked an error: {}", err)),`
`165`	`167`	`}`
`166`	`168`	`}`